Merge branch 'develop'

classes/customer/DefaultSignUpHandler.php

@@ -185,13 +185,13 @@ protected function signUp(array $data)
      */
     protected function validate(array $data)
     {
-        $rules = self::rules();
+        $rules = static::rules();
 
         if ($this->asGuest) {
             unset($rules['password'], $rules['password_repeat']);
         }
 
-        $messages = self::messages();
+        $messages = static::messages();
 
         $validation = Validator::make($data, $rules, $messages);
 

components/Cart.php

@@ -183,7 +183,7 @@ public function setData()
     /**
      * The user updated the quantity of a specific cart item.
      *
-     * @return void
+     * @return array
      */
     public function onUpdateQuantity()
     {
@@ -193,17 +193,24 @@ public function onUpdateQuantity()
         $product = $this->getProductFromCart($cart, $id);
 
         if (!$product) {
-            return;
+            return [];
         }
 
         try {
             $cart->setQuantity($product->id, (int)input('quantity'));
         } catch (OutOfStockException $exc) {
             Flash::error(trans('offline.mall::lang.common.out_of_stock', ['quantity' => $exc->product->stock]));
 
-            return;
+            return [];
         } finally {
             $this->setData();
+
+            return [
+                'item' => $this->dataLayerArray($product->product, $product->variant),
+                'quantity' => optional($product)->quantity ?? 0,
+                'new_items_count' => optional($this->cart->products)->count() ?? 0,
+                'new_items_quantity' => optional($this->cart->products)->sum('quantity') ?? 0,
+            ];
         }
     }
 

components/ProductsFilter.php

@@ -439,6 +439,7 @@ protected function setPriceRange()
     protected function setBrands()
     {
         $brands = DB::table('offline_mall_products')
+            ->where('offline_mall_products.published', '=', true)
             ->whereIn('offline_mall_category_product.category_id', $this->categories->pluck('id'))
             ->select('offline_mall_brands.*')
             ->distinct()

models/PaymentMethod.php

@@ -71,6 +71,7 @@ class PaymentMethod extends Model
     public $translatable = [
         'name',
         'description',
+        'instructions',
     ];
 
     /**

updates/version.yaml

@@ -623,3 +623,5 @@ v3.5.10:
     - 'Fixed attaching/detaching of property groups to categories'
 v3.5.11:
     - 'Various small bugfixes'
+v3.5.12:
+    - 'Various small additions (thanks to @RickAcb and @rubenvanerk)'