From 047a34e76bf1c5d09f973680ff2381c2ee7fc853 Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Fri, 6 Sep 2019 19:04:57 +0530
Subject: [PATCH] Translation fixes and changes in cart rule datagrid

---
 .../Admin/src/DataGrids/CartRuleDataGrid.php  | 22 ++-----------------
 .../Admin/src/Resources/lang/en/app.php       |  5 +++--
 .../promotions/catalog-rule/index.blade.php   |  2 +-
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php
index 6f9401d4b..56887114a 100644
--- a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php
@@ -21,7 +21,7 @@ class CartRuleDataGrid extends DataGrid
     {
         $queryBuilder = DB::table('cart_rules')
                 ->select('id')
-                ->addSelect('id', 'name', 'starts_from', 'ends_till', 'priority', 'status', 'end_other_rules', 'action_type', 'disc_quantity', 'disc_threshold', 'use_coupon');
+                ->addSelect('id', 'name', 'status', 'end_other_rules', 'action_type', 'disc_amount', 'use_coupon');
 
         $this->setQueryBuilder($queryBuilder);
     }
@@ -46,15 +46,6 @@ class CartRuleDataGrid extends DataGrid
             'filterable' => true
         ]);
 
-        $this->addColumn([
-            'index' => 'priority',
-            'label' => trans('admin::app.datagrid.priority'),
-            'type' => 'number',
-            'searchable' => false,
-            'sortable' => true,
-            'filterable' => true,
-        ]);
-
         $this->addColumn([
             'index' => 'status',
             'label' => trans('admin::app.datagrid.status'),
@@ -98,7 +89,7 @@ class CartRuleDataGrid extends DataGrid
         ]);
 
         $this->addColumn([
-            'index' => 'disc_quantity',
+            'index' => 'disc_amount',
             'label' => 'Quantity',
             'type' => 'number',
             'searchable' => false,
@@ -106,15 +97,6 @@ class CartRuleDataGrid extends DataGrid
             'filterable' => true
         ]);
 
-        $this->addColumn([
-            'index' => 'disc_threshold',
-            'label' => 'Threshold',
-            'type' => 'number',
-            'searchable' => false,
-            'sortable' => true,
-            'filterable' => true
-        ]);
-
         $this->addColumn([
             'index' => 'use_coupon',
             'label' => 'Use Coupon',
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 65595ab9c..5bedef3ec 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -827,7 +827,7 @@ return [
         'zero-unlimited' => 'Zero denotes unlimited usage here',
         'catalog-rule' => 'Catalog Rules',
         'cart-rule' => 'Cart Rules',
-        'add-catalog-rule' => 'Add Catalog Rule',
+        'add-catalog-rule' => 'Add Rule',
         'add-cart-rule' => 'Add Cart Rule',
         'edit-cart-rule' => 'Edit Cart Rule',
         'edit-catalog-rule' => 'Edit Catalog Rule',
@@ -850,10 +850,11 @@ return [
         'yes' => 'Yes',
         'no' => 'No',
         'note' => 'Note',
+        'apply' => 'Apply',
         'rule-name' => 'Enter Rule Name',
         'rule-desc' => 'Enter Rule Description',
         'convert-x-note' => 'If this section is left empty, then rule will get applied to all the products in the cart.',
-        'declut' => 'Declutter Rules',
+        'declut' => 'Declutter',
         'processing-done' => 'Rules processing done',
         'declut-success' => 'Catalog rules decluttering successful',
         'declut-failure' => 'Catalog rules decluttering failed',
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/index.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/index.blade.php
index 2f807cdae..6790810ea 100644
--- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/index.blade.php
@@ -18,7 +18,7 @@
                 </a>
 
                 <a href="{{ route('admin.catalog-rule.apply') }}" class="btn btn-lg btn-primary">
-                    {{ __('Apply Rules') }}
+                    {{ __('admin::app.promotion.apply') }}
                 </a>
 
                 <a href="{{ route('admin.catalog-rule.declut') }}" class="btn btn-lg btn-primary">