Merge branch 'master' into guest_functionality_removal

packages/Webkul/API/Http/Controllers/Shop/SessionController.php

@@ -103,23 +103,19 @@ class SessionController extends Controller
             'password'      => 'confirmed|min:6',
         ]);
 
-        $data = request()->all();
+        $data = request()->only('first_name', 'last_name', 'gender', 'date_of_birth', 'email', 'password');
 
-        if (! $data['date_of_birth']) {
-            unset($data['date_of_birth']);
-        }
-
-        if (!isset($data['password']) || ! $data['password']) {
+        if (! isset($data['password']) || ! $data['password']) {
             unset($data['password']);
         } else {
             $data['password'] = bcrypt($data['password']);
         }
 
-        $this->customerRepository->update($data, $customer->id);
+        $updatedCustomer = $this->customerRepository->update($data, $customer->id);
 
         return response()->json([
-            'message' => 'Your account has been created successfully.',
-            'data'    => new CustomerResource($this->customerRepository->find($customer->id)),
+            'message' => 'Your account has been updated successfully.',
+            'data'    => new CustomerResource($updatedCustomer),
         ]);
     }
 
@@ -136,4 +132,4 @@ class SessionController extends Controller
             'message' => 'Logged out successfully.',
         ]);
     }
-}
+}

packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php

@@ -1,5 +1,5 @@
 @if (request()->route()->getName() == 'shop.checkout.onepage.index')
-<script src="https://www.paypal.com/sdk/js?client-id={{core()->getConfigData('sales.paymentmethods.paypal_smart_button.client_id')}}"></script>
+<script src="https://www.paypal.com/sdk/js?client-id={{core()->getConfigData('sales.paymentmethods.paypal_smart_button.client_id')}}" data-partner-attribution-id="Bagisto_Cart"></script>
 
 <style>
     .component-frame.visible {

packages/Webkul/Velocity/publishable/assets/mix-manifest.json

@@ -1,5 +1,5 @@
 {
-    "/js/velocity.js": "/js/velocity.js?id=013ec732c78572587136",
+    "/js/velocity.js": "/js/velocity.js?id=93f3ffabc5a222cd5737",
     "/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
-    "/css/velocity.css": "/css/velocity.css?id=a37ae1fb6f34223126b8"
+    "/css/velocity.css": "/css/velocity.css?id=8cf54786f83b29684543"
 }

packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss

@@ -349,6 +349,10 @@
         }
     }
 
+    .description {
+        overflow: auto;
+    }
+
     .full-description {
         font-size: 14px;
     }

packages/Webkul/Velocity/src/Resources/assets/sass/components/rtl.scss

@@ -2,6 +2,15 @@ body {
     &.rtl {
         text-align: right;
 
+        .fs16 {
+            font-size: 14px !important;
+        }
+
+        .order-summary-container {
+            margin-left: 0px;
+            margin-right: 130px;
+        }
+
         .velocity-divide-page {
             .right {
                 padding-left: 0 !important;
@@ -446,6 +455,7 @@ body {
         }
         .pr0 {
             padding-left: 0 !important;
+            padding-right: 15px !important;
         }
         .pl0 {
             padding-right: 0px !important;
@@ -518,6 +528,10 @@ body {
 @media only screen and (max-width: 992px) {
     body {
         &.rtl {
+            .order-summary-container {
+                margin-right: 0px;
+            }
+            
             .nav-container {
                 ul {
                     li {
@@ -571,6 +585,36 @@ body {
     }
 }
 
+@media only screen and (max-width: 425px) {
+    body {
+        &.rtl {
+            .fs16 {
+                font-size: 12px !important;
+            }
+        }
+    }
+}
+
+@media only screen and (max-width: 375px) {
+    body {
+        &.rtl {
+            .fs16 {
+                font-size: 10px !important;
+            }
+        }
+    }
+}
+
+@media only screen and (max-width: 320px) {
+    body {
+        &.rtl {
+            .fs16 {
+                font-size: 8px !important;
+            }
+        }
+    }
+}
+
 body.rtl .payment-methods {
     .pl40 {
         padding-right: 40px !important;