UAT changes

b157b563 · Sarath Mohan · 344eb4a9 · b157b563 · b157b563 · b157b563
Commit b157b563 authored Nov 30, 2017 by Sarath Mohan
26 changed files
--- a/app/Http/Middleware/Cors.php
+++ b/app/Http/Middleware/Cors.php
--- a/app/PaymentDetails.php
+++ b/app/PaymentDetails.php
--- a/database/migrations/2017_10_17_101737_add_delivery_charge_order_confirm_table.php
+++ b/database/migrations/2017_10_17_101737_add_delivery_charge_order_confirm_table.php
--- a/database/migrations/2017_10_23_113359_create_payments_details_table.php
+++ b/database/migrations/2017_10_23_113359_create_payments_details_table.php
--- a/database/migrations/2017_10_23_134304_add_column_payment_details_table.php
+++ b/database/migrations/2017_10_23_134304_add_column_payment_details_table.php
--- a/database/migrations/2017_11_02_124632_add_column_type_product_groups_table.php
+++ b/database/migrations/2017_11_02_124632_add_column_type_product_groups_table.php
--- a/database/migrations/2017_11_10_123256_add_pickup_time_order_confirm_table.php
+++ b/database/migrations/2017_11_10_123256_add_pickup_time_order_confirm_table.php
--- a/database/seeds/PaymentDetails.php
+++ b/database/seeds/PaymentDetails.php
--- a/public/admin/css/bootstrap-combined.no-icons.min.css
+++ b/public/admin/css/bootstrap-combined.no-icons.min.css
--- a/public/admin/css/font-awesome.css
+++ b/public/admin/css/font-awesome.css
--- a/public/admin/css/jquery-confirm.min.css
+++ b/public/admin/css/jquery-confirm.min.css
--- a/public/admin/js/jquery-confirm.min.js
+++ b/public/admin/js/jquery-confirm.min.js
--- a/public/frontend/css/font-awesome.min.css
+++ b/public/frontend/css/font-awesome.min.css
--- a/public/frontend/img/empty-cart.png
+++ b/public/frontend/img/empty-cart.png
--- a/public/frontend/img/icon_map/icon_map.png
+++ b/public/frontend/img/icon_map/icon_map.png
--- a/public/frontend/img/loader_payment.gif
+++ b/public/frontend/img/loader_payment.gif
--- a/public/frontend/js/jquery.collapsible.min.js
+++ b/public/frontend/js/jquery.collapsible.min.js
--- a/public/frontend/js/jquery.payment.js
+++ b/public/frontend/js/jquery.payment.js
--- a/public/frontend/js/jquery.transit.min.js
+++ b/public/frontend/js/jquery.transit.min.js
--- a/public/frontend/js/moment.min.js
+++ b/public/frontend/js/moment.min.js
--- a/resources/views/layouts/footer.blade.php
+++ b/resources/views/layouts/footer.blade.php
+Test Footer
\ No newline at end of file
--- a/resources/views/layouts/header.blade.php
+++ b/resources/views/layouts/header.blade.php
@@ -2584,9 +2584,8 @@
                        child_price=parseFloat(child_price).toFixed(2)*item.qty;
                        total_price=total_price+child_price;
                    }else{
-
                        total_price=total_price+((parseFloat(item.product.Retail_Price)+(parseFloat(item.product.Retail_Price))*parseFloat(item.product.TaxRate)/100)*parseInt(item.qty));
-
+                        console.log(total_price);
                        total_tax=total_tax+((parseFloat(item.product.Retail_Price)*parseInt(item.qty))*parseFloat(item.product.TaxRate)/100);
                        var product_price=parseFloat(item.product.Retail_Price)+(parseFloat(item.product.Retail_Price)*parseFloat(item.product.TaxRate)/100);
                        product_price=parseFloat(product_price).toFixed(2);

--- a/resources/views/public/emails/orderPlaced.blade.php
+++ b/resources/views/public/emails/orderPlaced.blade.php
--- a/resources/views/public/home.blade.php
+++ b/resources/views/public/home.blade.php
@@ -156,6 +156,7 @@
    </div>
    <!-- Modal productchoose-->
 @stop
+@include('layouts.footer');
 @section('js')
    <script>
        var globalColor = '';

--- a/resources/views/public/previousOrder.blade.php
+++ b/resources/views/public/previousOrder.blade.php
--- a/resources/views/public/termsAndConditions.blade.php
+++ b/resources/views/public/termsAndConditions.blade.php