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

Merge pull request #1022 from jitendra-webkul/jitendra 

Jitendra
This commit is contained in:
Jitendra Singh 2019-06-13 19:49:49 +05:30 committed by GitHub
parent d370821f7f 6e8c0da054
commit b25a8656ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
View File

@ -249,7 +249,7 @@
<td>{{ core()->formatBasePrice($item->base_discount_amount) }}</td>
@endif
<td>{{ core()->formatBasePrice($item->base_total + $item->base_tax_amount) }}</td>
<td>{{ core()->formatBasePrice($item->base_total + $item->base_tax_amount - $item->base_total + $item->base_tax_amount) }}</td>
</tr>
@endforeach

2
packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
View File

@ -289,7 +289,7 @@
<td>{{ core()->formatBasePrice($item->base_discount_amount) }}</td>
@endif
<td>{{ core()->formatBasePrice($item->base_total + $item->base_tax_amount) }}</td>
<td>{{ core()->formatBasePrice($item->base_total + $item->base_tax_amount - $item->base_discount_amount) }}</td>
</tr>
@endforeach
</table>

3
packages/Webkul/Checkout/src/Cart.php
View File

@ -1167,6 +1167,9 @@ class Cart {
'tax_percent' => $data['tax_percent'],
'tax_amount' => $data['tax_amount'],
'base_tax_amount' => $data['base_tax_amount'],
'discount_percent' => $data['discount_percent'],
'discount_amount' => $data['discount_amount'],
'base_discount_amount' => $data['base_discount_amount'],
'additional' => $data['additional'],
];

2
packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php
View File

@ -411,4 +411,4 @@ class CartRuleController extends Controller
'states' => $states
];
}
}
}

2
packages/Webkul/Shop/publishable/assets/js/shop.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=ad1039174ce2c81c8805",
"/js/shop.js": "/js/shop.js?id=9a7027b387c171cd0fd3",
"/css/shop.css": "/css/shop.css?id=0e57754dbdaba7c6eb76"
}
}

2
packages/Webkul/Ui/publishable/assets/js/ui.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Ui/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=3cebf9d7b4dc56d1b407",
"/js/ui.js": "/js/ui.js?id=a882033f451695263976",
"/css/ui.css": "/css/ui.css?id=c846938a649c221ac297"
}
}