#2708 - Changes from #2708 (comment)

cubecart · Jun 15, 2022 · 50e52c8 · 50e52c8
1 parent d93f0de
commit 50e52c8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/admin/sources/statistics.index.inc.php b/admin/sources/statistics.index.inc.php
@@ -301,7 +301,7 @@
     $GLOBALS['smarty']->assign('PAGINATION_BEST', $GLOBALS['db']->pagination($numrows, $per_page, $page, 5, 'page_customers', 'stats_best_customers', ' ', false));
     unset($results, $result, $divider);
 }
-
+$smarty_data['plugin_tabs'] = array();
 foreach ($GLOBALS['hooks']->load('admin.statistics.tabs') as $hook) {
     include $hook;
 }

diff --git a/classes/cart.class.php b/classes/cart.class.php
@@ -549,7 +549,7 @@ public function discountAdd($code)
                         }
                     }
                 }
-                if ($coupon['free_shipping_excluded']=='1' && floatval($this->basket['shipping']['value'])==0) {
+                if ($coupon['free_shipping_excluded']=='1' && (!isset($this->basket['shipping']) || floatval($this->basket['shipping']['value'])==0)) {
                     // Minimum subtotal for voucher has not been met
                     $GLOBALS['gui']->setError($GLOBALS['language']->checkout['error_voucher_free_shipping']);
                     return false;
@@ -896,7 +896,7 @@ public function get()
                 $this->basket_data[$hash] = $product;
 
                 // Calculate Taxes
-                $tax_state_id = is_numeric($this->basket[$tax_on]['state_id']) ? $this->basket[$tax_on]['state_id'] : getStateFormat($this->basket[$tax_on]['state_id'], 'name', 'id');
+                if (isset($this->basket[$tax_on])) $tax_state_id = is_numeric($this->basket[$tax_on]['state_id']) ? $this->basket[$tax_on]['state_id'] : getStateFormat($this->basket[$tax_on]['state_id'], 'name', 'id');
 
                 if (isset($tax_state_id)) {
                     $product_tax =  $GLOBALS['tax']->productTax($product['price'], (int)$product['tax_type'], (bool)$product['tax_inclusive'], $tax_state_id);
@@ -1308,12 +1308,12 @@ private function _applyDiscounts()
                         }
                     }
 
-                    if ($data['shipping'] && $this->basket['shipping']['value']>0) {
+                    if (isset($this->basket['shipping']) && $data['shipping'] && $this->basket['shipping']['value']>0) {
                         $subtotal += $this->basket['shipping']['value'];
                         if ($this->basket['shipping']['tax']['amount']>0) {
                             $tax_total += $this->basket['shipping']['tax']['amount'];
                         }
-                    } elseif ($this->basket['shipping']['value']>0) {
+                    } elseif (isset($this->basket['shipping']) && $this->basket['shipping']['value']>0) {
                         $excluded_shipping = $this->basket['shipping'];
                     }
 
@@ -1353,7 +1353,7 @@ private function _applyDiscounts()
                     }
                 }
 
-                if ($this->basket['shipping']['value']>0) {
+                if (isset($this->basket['shipping']) && $this->basket['shipping']['value']>0) {
                     $subtotal += $this->basket['shipping']['value'];
                     if ($this->basket['shipping']['tax']['amount']>0) {
                         $tax_total += $this->basket['shipping']['tax']['amount'];

diff --git a/includes/lib/smarty/Smarty.class.php b/includes/lib/smarty/Smarty.class.php
@@ -166,7 +166,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * The date format to be used internally
      * (accepts date() and strftime())
      */
-    public static $_DATE_FORMAT = '%b %e, %Y';
+    public static $_DATE_FORMAT = 'M j, Y';
 
     /**
      * Flag denoting if PCRE should run in UTF-8 mode