Translation fixes and changes in cart rule datagrid

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',

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',

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">