Project-Pro/shopPRO
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Orlen Paczka - test

Browse Source
This commit is contained in:
Roman Pyrih
2024-10-25 09:56:32 +02:00
parent b6d6146e1f
commit 1a75e0b22f
2 changed files with 62 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.htaccess
View File

@@ -73,6 +73,9 @@ RewriteRule ^ /%1 [R=301,L]
<IfModule mod_deflate.c>
AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml application/xhtml+xml text/css text/javascript application/javascript application/x-javascript
</IfModule>
<IfModule mod_headers.c>
Header set Access-Control-Allow-Origin "*"
</IfModule>
<IfModule mod_expires.c>
ExpiresActive on
ExpiresDefault "access plus 1 month"
@@ -230,8 +233,14 @@ RewriteRule ^wyprzedaz/1$ wyprzedaz [R=301,L]
RewriteRule ^en/kocyk-minky-niemowlaka-50x70-en$ index.php?category=6&lang=en&%{QUERY_STRING} [L]
RewriteRule ^en/kocyk-minky-niemowlaka-50x70-en/([0-9]+)$ index.php?category=6&lang=en&bs=$1&%{QUERY_STRING} [L]
RewriteRule ^en/kocyk-minky-niemowlaka-50x70-en/1$ en/kocyk-minky-niemowlaka-50x70-en [R=301,L]
RewriteRule ^p-425-a-tabliczki-z-miesiacami-galazka-kopi$ index.php?product=425 [L]
RewriteRule ^p-425-a-tabliczki-z-miesiacami-galazka-kopi/([0-9-]+)$ index.php?product=425&permutation_hash=$1 [L]
RewriteRule ^p-404-b-tabliczki-z-miesiacami-galazka$ index.php?product=404 [L]
RewriteRule ^p-404-b-tabliczki-z-miesiacami-galazka/([0-9-]+)$ index.php?product=404&permutation_hash=$1 [L]
RewriteRule ^drewniana-tabliczka-modlitwa-aniele-bozy-strozu-moj-chmurka$ index.php?product=403 [L]
RewriteRule ^p-404-tabliczki-z-miesiacami-galazka$ index.php?product=404 [L]
RewriteRule ^drewniana-tabliczka-modlitwa-aniele-bozy-strozu-moj-chmurka/([0-9-]+)$ index.php?product=403&permutation_hash=$1 [L]
RewriteRule ^en/p-425-kopia$ index.php?product=425 [L]
RewriteRule ^en/p-425-kopia/([0-9-]+)$ index.php?product=425&permutation_hash=$1 [L]
RewriteCond %{REQUEST_URI} ^/home$
RewriteRule ^(.*)$ http://www.shoppro.project-dc.pl/ [R=permanent,L]
RewriteCond %{REQUEST_URI} ^/home-1$

53
templates/shop-basket/basket.php
View File

@@ -6,7 +6,7 @@
Chcesz skorzystać z odroczonych płatności <img src="/layout/images/paypo-logo.svg">? Wybierz jedną z form dostawy: <strong>odbiór osobisty, Paczkomaty InPost - przedpłata lub Kurier - przedpłata</strong>.<br/>
Wartość zamówienia musi mieścić się w przedziale od 40 zł do 1000 zł.
</div>
<? if ( is_array( $this -> basket ) and count( $this -> basket ) ):?>
<? if ( is_array( $this -> basket ) and count( $this -> basket ) ):?>
<div class="basket-options">
<div class="content">
<div class="left">
@@ -18,6 +18,12 @@
<a href="#" onclick="inpost_check(); return false;" class="inpost-hide"><?= \S::lang( 'zamknij' );?></a>
<div id="inpost-map"></div>
</div>
<!-- <div class="orlen-map-container">
<a href="#" onclick="orlen_check(); return false;" class="orlen-hide"><?= \S::lang( 'zamknij' );?></a>
<div id="orlen-map"></div>
</div> -->
</div>
<div class="right">
<div class="box-title"><?= ucfirst( \S::lang( 'platnosc' ) );?>:</div>
@@ -38,6 +44,7 @@
<script class="footer" type="text/javascript" src="https://geowidget.easypack24.net/js/sdk-for-javascript.js"></script>
<script class="footer" type="text/javascript">
var inpost_transport_method_id = '';
var orlen_transport_method_id = '';
function inpost_check() {
@@ -60,6 +67,23 @@
return false;
}
// function orlen_check() {
// $.ajax({
// type: 'POST',
// cache: false,
// url: '/shopBasket/orlen_check',
// beforeSend: function() {},
// success: function(response) {
// data = jQuery.parseJSON(response);
// if (data.result == 'bad') {
// $('.orlen-info-' + orlen_transport_method_id).html('<a href="#" onclick="orlen_map(' + orlen_transport_method_id + '); return false;">wybierz</a>');
// }
// $('.orlen-map-container').hide();
// }
// });
// return false;
// }
function payment_checked( payment_method_id )
{
$.ajax(
@@ -118,6 +142,33 @@
$( '.inpost-map-container' ).show();
}
// function orlen_map(transport_method_id) {
// orlen_transport_method_id = transport_method_id;
// window.orlenPackAsyncInit = function () {
// orlenPack.init({
// mapType: 'osm',
// });
// var map = orlenPack.mapWidget('orlen-map', function(point) {
// $.ajax({
// type: 'POST',
// cache: false,
// url: '/shopBasket/orlen_save',
// data: {
// paczka: point.name + ' | ' + point.address.line1 + ', ' + point.address.line2
// },
// beforeSend: function() {},
// success: function(response) {
// $('.orlen-info-' + transport_method_id).html(point.name + ' | ' + point.address.line1 + ', ' + point.address.line2 + '<a href="#" onclick="orlen_map(' + transport_method_id + '); return false;">Змінити</a>');
// $('.orlen-map-container').hide();
// }
// });
// });
// };
// $('.orlen-map-container').show();
// }
function transport_checked( transport_method_id, payment_method_id, event_click )
{
$.ajax({