From 2bddfa31f7856291ac6c608ad53606ea8dfeeda7 Mon Sep 17 00:00:00 2001 From: Jacek Pyziak Date: Sat, 4 Jan 2025 12:11:50 +0100 Subject: [PATCH] =?UTF-8?q?Zaktualizowano=20wersj=C4=99=20na=200.226,=20do?= =?UTF-8?q?dano=20opcj=C4=99=20faktury=20do=20zam=C3=B3wienia=20oraz=20wpr?= =?UTF-8?q?owadzono=20zmiany=20w=20strukturze=20bazy=20danych=20i=20logice?= =?UTF-8?q?=20obs=C5=82ugi=20zam=C3=B3wie=C5=84.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .htaccess | 8 +- admin/templates/shop-order/order-details.php | 18 +- admin/templates/shop-order/order-edit.php | 35 +- autoload/admin/controls/class.Settings.php | 3 +- autoload/admin/controls/class.ShopOrder.php | 3 +- autoload/admin/factory/class.ShopProduct.php | 3 +- autoload/front/controls/class.ShopBasket.php | 6 +- autoload/front/controls/class.ShopClient.php | 2 +- autoload/front/factory/class.ShopClient.php | 4 +- autoload/front/factory/class.ShopOrder.php | 14 +- autoload/shop/class.Order.php | 8 +- cron.php | 11 +- layout/style-css/style.css | 2 +- layout/style-css/style.css.map | 2 +- layout/style-scss/style.scss | 6407 +++++++++-------- .../jquery.motionCaptcha.0.2.css | 41 - .../MotionCAPTCHA/jquery.motionCaptcha.0.2.js | 654 -- .../MotionCAPTCHA/motionCaptcha-shapes.jpg | Bin 27675 -> 0 bytes libraries/htaccess.conf | 4 + templates/shop-basket/address-form.php | 72 +- templates/shop-client/address-edit.php | 3 - templates/shop-order/mail-summary.php | 10 + templates/shop-order/order-simple.php | 29 + updates/0.20/ver_0.226.zip | Bin 0 -> 388493 bytes updates/0.20/ver_0.226_sql.txt | 10 + updates/changelog.php | 3 + updates/versions.php | 2 +- 27 files changed, 3422 insertions(+), 3932 deletions(-) delete mode 100644 libraries/MotionCAPTCHA/jquery.motionCaptcha.0.2.css delete mode 100644 libraries/MotionCAPTCHA/jquery.motionCaptcha.0.2.js delete mode 100644 libraries/MotionCAPTCHA/motionCaptcha-shapes.jpg create mode 100644 updates/0.20/ver_0.226.zip create mode 100644 updates/0.20/ver_0.226_sql.txt diff --git a/.htaccess b/.htaccess index 69a8f11..e1558c2 100644 --- a/.htaccess +++ b/.htaccess @@ -274,4 +274,10 @@ RewriteRule ^$ index.php?a=page&id=6&lang=en [L] RewriteRule ^en/home-en$ index.php?a=page&id=6&lang=en&%{QUERY_STRING} [L] RewriteRule ^en/home-en/([0-9]+)$ index.php?a=page&id=6&lang=en&bs=$1&%{QUERY_STRING} [L] RewriteRule ^en/home-en/1$ en/home-en [R=301,L] -RewriteRule ^en/tytul-en$ index.php?article=13&lang=en&%{QUERY_STRING} [L] \ No newline at end of file +RewriteRule ^en/tytul-en$ index.php?article=13&lang=en&%{QUERY_STRING} [L] +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d +RewriteRule ^ index.php [L] + +SetHandler application/x-lsphp83 /opt/alt/php83 usr/bin/lsphp + diff --git a/admin/templates/shop-order/order-details.php b/admin/templates/shop-order/order-details.php index a877733..a082ffe 100644 --- a/admin/templates/shop-order/order-details.php +++ b/admin/templates/shop-order/order-details.php @@ -10,11 +10,8 @@ ob_start();
Numer zamówienia: order[ 'number' ];?>
Data zamówienia order[ 'date_order' ];?>

-
Dane osoby kupującej:
+
Dane do dostawy:
order[ 'client_name' ];?> order[ 'client_surname' ];?>
- order[ 'client_firm' ] ):?> -
order[ 'client_firm' ];?>
- order[ 'client_street' ] ):?>
order[ 'client_street' ];?>
@@ -27,7 +24,18 @@ ob_start();
order[ 'client_email' ];?>
-
order[ 'client_phone' ];?>
+
order[ 'client_phone' ] );?>
+ order[ 'firm_name' ] ):?> +
+
Dane do faktury:
+
order[ 'firm_name' ];?>
+
order[ 'firm_street' ];?>
+
+ order[ 'firm_postal_code' ];?> + order[ 'firm_city' ];?> +
+
NIP: order[ 'firm_nip' ];?>
+
diff --git a/admin/templates/shop-order/order-edit.php b/admin/templates/shop-order/order-edit.php index 7bb9422..626493e 100644 --- a/admin/templates/shop-order/order-edit.php +++ b/admin/templates/shop-order/order-edit.php @@ -11,7 +11,7 @@ ob_start();
Numer zamówienia: order[ 'number' ];?>
Data zamówienia order[ 'date_order' ];?>

-
Dane osoby kupującej:
+
Dane do dostawy:
@@ -20,11 +20,6 @@ ob_start();
-
-
- -
-
@@ -48,6 +43,32 @@ ob_start();
+ order['firm_name'] ):?> +
Dane do faktury:
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
Kwota zamówienia order[ 'summary' ];?> zł
@@ -74,7 +95,7 @@ ob_start();
- +
-
-
- -
-
- transport_method['id'], [ 1, 2, 3, 9] ) ):?> required placeholder=" transport_method['id'], [ 1, 2, 3, 9] ) ):?> ()" value=""> + transport_method['id'], [ 1, 2, 3, 9] ) ):?> required placeholder=" transport_method['id'], [ 1, 2, 3, 9] ) ):?> ()" value="">
@@ -75,17 +70,51 @@ +48
- +
+
+
+
+ + +
+
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
@@ -110,10 +139,11 @@