From 5adfbf5eabb373dc2e1b43f3455acae939e2c48b Mon Sep 17 00:00:00 2001 From: Jacek Pyziak Date: Sat, 4 Jan 2025 12:11:00 +0100 Subject: [PATCH] =?UTF-8?q?Dodanie=20obs=C5=82ugi=20danych=20firmy=20w=20f?= =?UTF-8?q?ormularzach=20oraz=20poprawa=20warunk=C3=B3w=20sprawdzaj=C4=85c?= =?UTF-8?q?ych=20w=20kodzie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/templates/shop-order/order-details.php | 18 +- admin/templates/shop-order/order-edit.php | 35 +- admin/templates/update/main-view.php | 4 +- 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 | 23 +- layout/style-css/style.css | 2 +- layout/style-css/style.css.map | 2 +- layout/style-scss/style.scss | 31 + .../jquery.motionCaptcha.0.2.css | 41 -- .../MotionCAPTCHA/jquery.motionCaptcha.0.2.js | 654 ------------------ .../MotionCAPTCHA/motionCaptcha-shapes.jpg | Bin 27675 -> 0 bytes templates/shop-basket/address-form.php | 75 +- templates/shop-client/address-edit.php | 3 - templates/shop-order/mail-summary.php | 10 + templates/shop-order/order-simple.php | 29 + templates/shop-product/product.php | 4 +- 23 files changed, 218 insertions(+), 756 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 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 @@