From ec27ed4c8defcacee3f4c575eaa496d9d01cbfd2 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Thu, 13 Jun 2019 01:05:29 +0530 Subject: [PATCH] added credit max in configuration --- packages/Webkul/Admin/src/Config/system.php | 22 +++++++++++++++++-- .../Admin/src/Resources/lang/en/app.php | 5 ++++- .../promotions/cart-rule/create.blade.php | 2 +- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php index d0892714d..cf4f86667 100644 --- a/packages/Webkul/Admin/src/Config/system.php +++ b/packages/Webkul/Admin/src/Config/system.php @@ -65,13 +65,13 @@ return [ [ 'name' => 'subscription', 'title' => 'admin::app.admin.system.newsletter-subscription', - 'type' => 'boolean' + 'type' => 'boolean', ] ], ], [ 'key' => 'customer.settings.email', 'name' => 'admin::app.admin.system.email', - 'sort' => 2, + 'sort' => 3, 'fields' => [ [ 'name' => 'verification', @@ -79,6 +79,24 @@ return [ 'type' => 'boolean' ] ], + ], [ + 'key' => 'customer.settings.credit-max', + 'name' => 'admin::app.admin.system.credit-max', + 'sort' => 4, + 'fields' => [ + [ + 'name' => 'Use Credit Max', + 'title' => 'admin::app.admin.system.use-credit-max', + 'type' => 'boolean', + 'channel_based' => true + ], [ + 'name' => 'Credit Max Value', + 'title' => 'admin::app.admin.system.credit-max-value', + 'type' => 'text', + 'validation' => 'decimal', + 'channel_based' => true + ] + ], ], [ 'key' => 'general', 'name' => 'admin::app.admin.system.general', diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 275456eb9..601624dab 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -997,7 +997,10 @@ return [ 'weight-unit' => 'Weight Unit', 'design' => 'Design', 'admin-logo' => 'Admin Logo', - 'logo-image' => 'Logo Image' + 'logo-image' => 'Logo Image', + 'credit-max' => 'Customer Credit Max', + 'credit-max-value' => 'Credit Max Value', + 'use-credit-max' => 'Use Credit Max' ] ] ]; diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php index 0f406fa85..d19e6c828 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php @@ -353,7 +353,7 @@
- +