From ef3cdc8deb5b385e87eb0712f95487e170b9bc6b Mon Sep 17 00:00:00 2001 From: jitendra Date: Tue, 1 Sep 2020 17:45:02 +0530 Subject: [PATCH] Added some config for payment method additional information --- .../Admin/src/Resources/lang/ar/app.php | 4 +++- .../Admin/src/Resources/lang/de/app.php | 4 +++- .../Admin/src/Resources/lang/en/app.php | 4 +++- .../Admin/src/Resources/lang/es/app.php | 4 +++- .../Admin/src/Resources/lang/fa/app.php | 4 +++- .../Admin/src/Resources/lang/it/app.php | 4 +++- .../Admin/src/Resources/lang/nl/app.php | 4 +++- .../Admin/src/Resources/lang/pl/app.php | 4 +++- .../Admin/src/Resources/lang/pt_BR/app.php | 4 +++- .../Admin/src/Resources/lang/tr/app.php | 4 +++- packages/Webkul/Payment/src/Config/system.php | 12 ++++++++++++ packages/Webkul/Payment/src/Payment.php | 13 +++++++++++++ .../Payment/src/Payment/MoneyTransfer.php | 19 +++++++++++++++++++ .../Webkul/Payment/src/Payment/Payment.php | 19 +++++++++++++++++++ .../Shop/src/Resources/assets/sass/app.scss | 17 +++++++++++++++++ .../views/checkout/onepage/payment.blade.php | 9 +++++++++ .../views/products/view/product-add.blade.php | 2 +- 17 files changed, 120 insertions(+), 11 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php index 211430e27..d9a6f38d2 100644 --- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php @@ -1349,7 +1349,9 @@ return [ 'store-name' => 'اسم المتجر', 'vat-number' => 'ظريبه الشراء', 'contact-number' => 'رقم الاتصال', - 'bank-details' => 'التفاصيل المصرفية' + 'bank-details' => 'التفاصيل المصرفية', + 'mailing-address' => 'Send Check to', + 'instructions' => 'Instructions' ] ] ]; diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php index 5d3555a11..bcfdb5d64 100755 --- a/packages/Webkul/Admin/src/Resources/lang/de/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php @@ -1339,7 +1339,9 @@ return [ 'store-name' => 'Geschäftsname', 'vat-number' => 'Umsatzsteuer-Identifikationsnummer', 'contact-number' => 'Kontakt Nummer', - 'bank-details' => 'Bankdaten' + 'bank-details' => 'Bankdaten', + 'mailing-address' => 'Send Check to', + 'instructions' => 'Instructions' ], ], ]; \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 3132212b5..b07138bb1 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -1362,7 +1362,9 @@ return [ 'store-name' => 'Store Name', 'vat-number' => 'Vat Number', 'contact-number' => 'Contact Number', - 'bank-details' => 'Bank Details' + 'bank-details' => 'Bank Details', + 'mailing-address' => 'Send Check to', + 'instructions' => 'Instructions' ] ] ]; diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php index 4be45a6ab..4833328a0 100644 --- a/packages/Webkul/Admin/src/Resources/lang/es/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php @@ -1314,7 +1314,9 @@ return [ 'store-name' => 'Nombre de la tienda', 'vat-number' => 'Número de valor agregado', 'contact-number' => 'Número de contacto', - 'bank-details' => 'Detalles del banco' + 'bank-details' => 'Detalles del banco', + 'mailing-address' => 'Send Check to', + 'instructions' => 'Instructions' ] ] ]; diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php index a28bce36a..85b75172c 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php @@ -1358,7 +1358,9 @@ return [ 'store-name' => 'نام فروشگاه', 'vat-number' => 'شماره Vat', 'contact-number' => 'شماره تماس', - 'bank-details' => 'اطلاعات دقیق بانکی' + 'bank-details' => 'اطلاعات دقیق بانکی', + 'mailing-address' => 'Send Check to', + 'instructions' => 'Instructions' ] ] ]; diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php index 89ec0b43c..dff5c9761 100644 --- a/packages/Webkul/Admin/src/Resources/lang/it/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php @@ -1363,7 +1363,9 @@ return [ 'store-name' => 'Nome del negozio', 'vat-number' => 'Partita IVA', 'contact-number' => 'Numero di contatto', - 'bank-details' => 'Coordinate bancarie' + 'bank-details' => 'Coordinate bancarie', + 'mailing-address' => 'Send Check to', + 'instructions' => 'Instructions' ] ] ]; diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php index 17d4691c7..3f6c0e003 100644 --- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php @@ -1358,7 +1358,9 @@ return [ 'store-name' => 'Winkel naam', 'vat-number' => 'Btw-nummer', 'contact-number' => 'Contact nummer', - 'bank-details' => 'Bankgegevens' + 'bank-details' => 'Bankgegevens', + 'mailing-address' => 'Send Check to', + 'instructions' => 'Instructions' ] ] ]; diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php index 0a18e0230..82515f78a 100644 --- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php @@ -1347,7 +1347,9 @@ return [ 'store-name' => 'Nazwa sklepu', 'vat-number' => 'Numer VAT', 'contact-number' => 'Numer kontaktowy', - 'bank-details' => 'Dane bankowe' + 'bank-details' => 'Dane bankowe', + 'mailing-address' => 'Send Check to', + 'instructions' => 'Instructions' ] ] ]; \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php index fd32d04a4..e1c8beb29 100755 --- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php @@ -1361,7 +1361,9 @@ return [ 'store-name' => 'Nome da loja', 'vat-number' => 'Número de IVA', 'contact-number' => 'Número de contato', - 'bank-details' => 'Detalhes bancários' + 'bank-details' => 'Detalhes bancários', + 'mailing-address' => 'Send Check to', + 'instructions' => 'Instructions' ] ] ]; diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php index 8d2351d5d..d086e37bf 100644 --- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php @@ -1344,7 +1344,9 @@ return [ 'store-name' => 'Dükkan adı', 'vat-number' => 'KDV Numarası', 'contact-number' => 'İletişim numarası', - 'bank-details' => 'Banka detayları' + 'bank-details' => 'Banka detayları', + 'mailing-address' => 'Send Check to', + 'instructions' => 'Instructions' ] ] ]; diff --git a/packages/Webkul/Payment/src/Config/system.php b/packages/Webkul/Payment/src/Config/system.php index 08172c916..7150e1655 100755 --- a/packages/Webkul/Payment/src/Config/system.php +++ b/packages/Webkul/Payment/src/Config/system.php @@ -34,6 +34,12 @@ return [ 'validation' => 'required', 'channel_based' => false, 'locale_based' => true, + ], [ + 'name' => 'instructions', + 'title' => 'admin::app.admin.system.instructions', + 'type' => 'textarea', + 'channel_based' => false, + 'locale_based' => true, ], [ 'name' => 'sort', 'title' => 'admin::app.admin.system.sort_order', @@ -80,6 +86,12 @@ return [ 'validation' => 'required', 'channel_based' => false, 'locale_based' => true, + ], [ + 'name' => 'mailing_address', + 'title' => 'admin::app.admin.system.mailing-address', + 'type' => 'textarea', + 'channel_based' => false, + 'locale_based' => true, ], [ 'name' => 'sort', 'title' => 'admin::app.admin.system.sort_order', diff --git a/packages/Webkul/Payment/src/Payment.php b/packages/Webkul/Payment/src/Payment.php index a2c4f5729..1dde37f66 100755 --- a/packages/Webkul/Payment/src/Payment.php +++ b/packages/Webkul/Payment/src/Payment.php @@ -68,4 +68,17 @@ class Payment return $payment->getRedirectUrl(); } + + /** + * Returns payment method additional information + * + * @param string $code + * @return array + */ + public static function getAdditionalDetails($code) + { + $paymentMethodClass = app(Config::get('paymentmethods.' . $code . '.class')); + + return $paymentMethodClass->getAdditionalDetails(); + } } diff --git a/packages/Webkul/Payment/src/Payment/MoneyTransfer.php b/packages/Webkul/Payment/src/Payment/MoneyTransfer.php index 76b10d130..c9cfac168 100755 --- a/packages/Webkul/Payment/src/Payment/MoneyTransfer.php +++ b/packages/Webkul/Payment/src/Payment/MoneyTransfer.php @@ -15,4 +15,23 @@ class MoneyTransfer extends Payment { } + + /** + * Returns payment method additional information + * + * @return array + */ + public function getAdditionalDetails() + { + if (! $this->getConfigData('mailing_address') + || $this->getConfigData('mailing_address') == '' + ) { + return []; + } + + return [ + 'title' => trans('admin::app.admin.system.mailing-address'), + 'value' => $this->getConfigData('mailing_address'), + ]; + } } \ No newline at end of file diff --git a/packages/Webkul/Payment/src/Payment/Payment.php b/packages/Webkul/Payment/src/Payment/Payment.php index d4b76cbde..f390a814b 100755 --- a/packages/Webkul/Payment/src/Payment/Payment.php +++ b/packages/Webkul/Payment/src/Payment/Payment.php @@ -121,4 +121,23 @@ abstract class Payment { return $this->getConfigData('sort'); } + + /** + * Returns payment method additional information + * + * @return array + */ + public function getAdditionalDetails() + { + if (! $this->getConfigData('instructions') + || $this->getConfigData('instructions') == '' + ) { + return []; + } + + return [ + 'title' => trans('admin::app.admin.system.instructions'), + 'value' => $this->getConfigData('instructions'), + ]; + } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 1e35b38ec..482b81a59 100755 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -2830,6 +2830,23 @@ section.cart { .control-info { margin-left: 28px; } + + .instructions { + margin-top: 10px; + margin-left: 30px; + + label { + font-weight: 600; + font-size: 14px; + } + + p { + margin: 0; + font-size: 14px; + color: #777777; + font-style: italic; + } + } } .address-summary { diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/payment.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/payment.blade.php index f0ef5511f..487d31c7e 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/payment.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/payment.blade.php @@ -26,6 +26,15 @@
{{ __($payment['description']) }}
+ + + + @if (! empty($additionalDetails)) +
+ +

{{ $additionalDetails['value'] }}

+
+ @endif {!! view_render_event('bagisto.shop.checkout.payment-method.after', ['payment' => $payment]) !!} diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/product-add.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/product-add.blade.php index 3254792c6..ba4e3a25f 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/view/product-add.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view/product-add.blade.php @@ -1,4 +1,4 @@ -{!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!} +{!! view_render_event('bagisto.shop.products.view.product-add.before', ['product' => $product]) !!}
@include ('shop::products.add-to-cart', ['product' => $product])