merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1922 from rahulshukla-webkul/development 

Issue 1802.
This commit is contained in:
Jitendra Singh 2019-12-20 12:38:53 +05:30 committed by GitHub
parent 3c0de30400 642d99a63c
commit 619b922ba4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php
View File

@ -274,7 +274,7 @@
{{ __('admin::app.dashboard.order-count', ['count' => $item->total_orders]) }} {{ __('admin::app.dashboard.order-count', ['count' => $item->total_orders]) }}
 .   . 
{{ __('admin::app.dashboard.revenue', [ {{ __('admin::app.dashboard.revenue', [
'total' => core()->formatBasePrice($item->total_base_grand_total_invoiced) 'total' => core()->formatBasePrice($item->total_base_grand_total)
]) ])
}} }}
</div> </div>

1
packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
View File

@ -300,6 +300,7 @@
this_this.current_step = this_this.step_numbers[response.data.jump_to_section]; this_this.current_step = this_this.step_numbers[response.data.jump_to_section];
shippingMethods = response.data.shippingMethods; shippingMethods = response.data.shippingMethods;
paymentMethods = response.data.paymentMethods;
this_this.getOrderSummary(); this_this.getOrderSummary();
}) })