diff --git a/config/app.php b/config/app.php index 1ea3304be..906faa674 100755 --- a/config/app.php +++ b/config/app.php @@ -219,6 +219,8 @@ return [ //Laravel Maatwebsite Maatwebsite\Excel\ExcelServiceProvider::class, + Barryvdh\Debugbar\ServiceProvider::class, + //Repository Prettus\Repository\Providers\RepositoryServiceProvider::class, Konekt\Concord\ConcordServiceProvider::class, diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index b95c40dba..5cf8da337 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -859,6 +859,8 @@ class Cart { 'shipping_description' => $data['selected_shipping_rate']['method_description'], 'shipping_amount' => $data['selected_shipping_rate']['price'], 'base_shipping_amount' => $data['selected_shipping_rate']['base_price'], + 'shipping_discount_amount' => $data['selected_shipping_rate']['discount_amount'], + 'base_shipping_discount_amount' => $data['selected_shipping_rate']['base_discount_amount'], 'shipping_address' => array_except($data['shipping_address'], ['id', 'cart_id']), ]); } diff --git a/packages/Webkul/Sales/src/Database/Migrations/2020_01_09_154851_add_shipping_discount_columns_in_orders_table.php b/packages/Webkul/Sales/src/Database/Migrations/2020_01_09_154851_add_shipping_discount_columns_in_orders_table.php new file mode 100644 index 000000000..2d5f69876 --- /dev/null +++ b/packages/Webkul/Sales/src/Database/Migrations/2020_01_09_154851_add_shipping_discount_columns_in_orders_table.php @@ -0,0 +1,33 @@ +decimal('shipping_discount_amount', 12, 4)->default(0)->nullable(); + $table->decimal('base_shipping_discount_amount', 12, 4)->default(0)->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('orders', function (Blueprint $table) { + // + }); + } +} diff --git a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php index 9e2d21de0..2187b1e69 100755 --- a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php +++ b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php @@ -230,10 +230,18 @@ class InvoiceRepository extends Repository $invoice->shipping_amount = $invoice->order->shipping_amount; $invoice->base_shipping_amount = $invoice->order->base_shipping_amount; + $invoice->discount_amount += $invoice->order->shipping_discount_amount; + $invoice->base_discount_amount += $invoice->order->base_shipping_discount_amount; + if ($invoice->order->shipping_amount) { foreach ($invoice->order->invoices as $prevInvoice) { if ((float) $prevInvoice->shipping_amount) $invoice->shipping_amount = $invoice->base_shipping_amount = 0; + + if ($prevInvoice->id != $invoice->id) { + $invoice->discount_amount -= $invoice->order->shipping_discount_amount; + $invoice->base_discount_amount -= $invoice->order->base_shipping_discount_amount; + } } }