Merge pull request #1178 from rahulshukla-webkul/development

Development

packages/Webkul/Category/src/Database/Migrations/2019_07_11_151210_add_locale_id_in_category_translations.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddLocaleIdInCategoryTranslations extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('category_translations', function (Blueprint $table) {
+            $table->integer('locale_id')->nullable()->unsigned();
+        });
+
+        Schema::table('category_translations', function (Blueprint $table) {
+            $table->foreign('locale_id')->references('id')->on('locales')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

packages/Webkul/Category/src/Models/CategoryTranslation.php

@@ -9,5 +9,5 @@ class CategoryTranslation extends Model implements CategoryTranslationContract
 {
     public $timestamps = false;
 
-    protected $fillable = ['name', 'description', 'slug', 'meta_title', 'meta_description', 'meta_keywords'];
+    protected $fillable = ['name', 'description', 'slug', 'meta_title', 'meta_description', 'meta_keywords', 'locale_id'];
 }

packages/Webkul/Category/src/Repositories/CategoryRepository.php

@@ -53,6 +53,7 @@ class CategoryRepository extends Repository
                 foreach ($model->translatedAttributes as $attribute) {
                     if (isset($data[$attribute])) {
                         $data[$locale->code][$attribute] = $data[$attribute];
+                        $data[$locale->code]['locale_id'] = $locale->id;
                     }
                 }
             }

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

@@ -1,4 +1,4 @@
 {
     "/js/shop.js": "/js/shop.js?id=71f03d05d9690fe24784",
-    "/css/shop.css": "/css/shop.css?id=73e6fda213d31cc70bd6"
+    "/css/shop.css": "/css/shop.css?id=6d68dddc5dcfc8e4f410"
 }

packages/Webkul/Shop/src/Resources/assets/sass/app.scss

@@ -3581,6 +3581,14 @@ section.review {
     section.slider-block div.slider-content div.slider-control {
         left: 2%;
         right: auto;
+
+        .slider-left {
+            float: left;
+        }
+
+        .slider-right {
+            margin-left: 5px;
+        }
     }
 
     @media only screen and (max-width: 720px) {