diff --git a/autoload/.DS_Store b/autoload/.DS_Store new file mode 100644 index 0000000..3239922 Binary files /dev/null and b/autoload/.DS_Store differ diff --git a/autoload/admin/controls/class.ShopOrder.php b/autoload/admin/controls/class.ShopOrder.php index 22b7545..bff2dbd 100644 --- a/autoload/admin/controls/class.ShopOrder.php +++ b/autoload/admin/controls/class.ShopOrder.php @@ -52,7 +52,7 @@ class ShopOrder public static function order_details() { $order = new \shop\Order( (int)\S::get( 'order_id' ) ); - $coupon = new \shop\Coupon( $order -> 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 0000000..7285fd1 Binary files /dev/null and b/autoload/front/.DS_Store differ 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,