diff --git a/packages/Webkul/Sales/src/Config/system.php b/packages/Webkul/Sales/src/Config/system.php index 34bdbbae0..7c6c9830a 100644 --- a/packages/Webkul/Sales/src/Config/system.php +++ b/packages/Webkul/Sales/src/Config/system.php @@ -35,7 +35,7 @@ return [ 'locale_based' => true, ], [ - 'name' => 'order_number_generator-class', + 'name' => 'order_number_generator_class', 'title' => 'admin::app.admin.system.order-number-generator-class', 'type' => 'text', 'validation' => false, @@ -43,10 +43,48 @@ return [ 'locale_based' => true, ], ] + ], [ + 'key' => 'sales.orderSettings.invoice_number', + 'name' => 'admin::app.admin.system.invoice-number', + 'sort' => 1, + 'fields' => [ + [ + 'name' => 'invoice_number_prefix', + 'title' => 'admin::app.admin.system.invoice-number-prefix', + 'type' => 'text', + 'validation' => false, + 'channel_based' => true, + 'locale_based' => true, + ], + [ + 'name' => 'invoice_number_length', + 'title' => 'admin::app.admin.system.invoice-number-length', + 'type' => 'text', + 'validation' => 'numeric', + 'channel_based' => true, + 'locale_based' => true, + ], + [ + 'name' => 'invoice_number_suffix', + 'title' => 'admin::app.admin.system.invoice-number-suffix', + 'type' => 'text', + 'validation' => false, + 'channel_based' => true, + 'locale_based' => true, + ], + [ + 'name' => 'invoice_number_generator_class', + 'title' => 'admin::app.admin.system.invoice-number-generator-class', + 'type' => 'text', + 'validation' => false, + 'channel_based' => true, + 'locale_based' => true, + ], + ] ], [ 'key' => 'sales.orderSettings.minimum-order', 'name' => 'admin::app.admin.system.minimum-order', - 'sort' => 1, + 'sort' => 2, 'fields' => [ [ 'name' => 'minimum_order_amount', @@ -60,7 +98,7 @@ return [ ], [ 'key' => 'sales.orderSettings.invoice_slip_design', 'name' => 'admin::app.admin.system.invoice-slip-design', - 'sort' => 2, + 'sort' => 3, 'fields' => [ [ 'name' => 'logo', @@ -71,4 +109,4 @@ return [ ], ] ] -]; \ No newline at end of file +]; diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php index a46bad069..c02f7dfa8 100755 --- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php +++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php @@ -216,7 +216,7 @@ class OrderRepository extends Repository /** * @var $generatorClass Sequencer */ - $generatorClass = core()->getConfigData('sales.orderSettings.order_number.order_number_generator-class') ?: false; + $generatorClass = core()->getConfigData('sales.orderSettings.order_number.order_number_generator_class') ?: false; if ($generatorClass !== false && class_exists($generatorClass)