From b5c614d792b1cf14eb428b3c5cf66479e70b87e2 Mon Sep 17 00:00:00 2001 From: Jacek Pyziak Date: Wed, 12 Mar 2025 08:05:34 +0100 Subject: [PATCH] =?UTF-8?q?Poprawiono=20obs=C5=82ug=C4=99=20kupon=C3=B3w?= =?UTF-8?q?=20w=20szczeg=C3=B3=C5=82ach=20zam=C3=B3wienia,=20aby=20unikn?= =?UTF-8?q?=C4=85=C4=87=20b=C5=82=C4=99d=C3=B3w=20przy=20braku=20identyfik?= =?UTF-8?q?atora=20kuponu.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- autoload/.DS_Store | Bin 0 -> 6148 bytes autoload/admin/controls/class.ShopOrder.php | 2 +- autoload/front/.DS_Store | Bin 0 -> 6148 bytes autoload/front/controls/class.ShopOrder.php | 2 +- autoload/shop/class.Order.php | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 autoload/.DS_Store create mode 100644 autoload/front/.DS_Store diff --git a/autoload/.DS_Store b/autoload/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..3239922a7e1693c4aee135bf32fa7086814704fc GIT binary patch literal 6148 zcmeHK%}N6?5T4Nr3%&H{F|W`!h-Lc(1-(iw>Y-~&(R-f8*YM`WC-UYuKZ=V1!Glzp zf#jQHX7ckbn`DTH7Y~~`(Ts>X6hRiHA=2G69l7%a$U4UT_GZ4iD#NZZ%wcxP+E3`3 z_EhMOTI>I09ZKJ?w`Gl(?&9_F<>~zSY#cw7%{Lyq+dsz8VScw*RWJ|?1Ovgq&l$j- zEz(U5qYegwfneZ+0XZKMiePrEhI(|M(i8wF&uA6sl1oTTa?Fm^5EckqD9}RLQw+9n z^e6Yrj@8h@i9PvXpZPs`VVxc0Cv_*zhEWFt!N8b-V{6Xj{$JvkX(svOkZ1)1!N5Ob zfG7Q`Utm*yw|?24+_eei5=BJ(swfcXqelQ5a*mv;(d coupon_id ); + $coupon = $order -> coupon_id ? new \shop\Coupon( $order -> coupon_id ) : null; return \Tpl::view( 'shop-order/order-details', [ 'order' => $order, diff --git a/autoload/front/.DS_Store b/autoload/front/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..7285fd13b00a087a6417494eb5c700e132b02819 GIT binary patch literal 6148 zcmeHKy-veG47N)IK`b2^Z)5Hogep8iC1z;LpVa6o)PmTu@mMgi_iY&Ye72&51c?cu z%9ecJ#b@8ocTpS@5l^?v3DKB{a;V_w7|nplxM)vCW|2Wob3}Tim(|^5wun7%H~dEi zmab_*8*1HOwQge!$xjr$bq1UPXP{v~z7GK^ zSQyrd>C=HGl>opD<|OD#Eg><%urRC@F#=%?1!^c;iNP8UdoaJkuvXM?Vk-3~NPLApRqeXz<1v_)`YH0K&6M2mk;8 literal 0 HcmV?d00001 diff --git a/autoload/front/controls/class.ShopOrder.php b/autoload/front/controls/class.ShopOrder.php index ac40287..2c18a2e 100644 --- a/autoload/front/controls/class.ShopOrder.php +++ b/autoload/front/controls/class.ShopOrder.php @@ -145,7 +145,7 @@ class ShopOrder $order = \front\factory\ShopOrder::order_details( \front\factory\ShopOrder::order_id( \S::get( 'order_hash' ) ) ); - $coupon = new \shop\Coupon( $order['coupon_id'] ); + $coupon = (int)$order['coupon_id'] ? new \shop\Coupon( (int)$order['coupon_id'] ) : null; return \Tpl::view( 'shop-order/order-details', [ 'order' => $order, diff --git a/autoload/shop/class.Order.php b/autoload/shop/class.Order.php index c74b545..d7179b2 100644 --- a/autoload/shop/class.Order.php +++ b/autoload/shop/class.Order.php @@ -328,7 +328,7 @@ class Order implements \ArrayAccess global $settings; $order = \front\factory\ShopOrder::order_details( $this -> id ); - $coupon = new \shop\Coupon( $order['coupon_id'] ); + $coupon = (int)$order['coupon_id'] ? new \shop\Coupon( (int)$order['coupon_id'] ) : null; $mail_order = \Tpl::view( 'shop-order/mail-summary', [ 'settings' => $settings,