diff --git a/app/Controllers/Purchase.php b/app/Controllers/Purchase.php index f20b3d0..dc5e2c5 100644 --- a/app/Controllers/Purchase.php +++ b/app/Controllers/Purchase.php @@ -122,6 +122,7 @@ class Purchase extends BaseController ->where('products.isactive',1) ->findAll(); $data['productAll']= json_encode($productAll); + $data['purchase_order_id']= $purchase_order_id; echo view('purchase_form',$data); } diff --git a/app/Views/bike_model_list.php b/app/Views/bike_model_list.php index a0dbb94..5effcf4 100644 --- a/app/Views/bike_model_list.php +++ b/app/Views/bike_model_list.php @@ -302,7 +302,7 @@ } // Move DataTable to the saved page and draw datatable_bikeModel.page(savedPage).draw(false); - $('.'+hightlight_tr).css('background','lightpink'); + $('.'+hightlight_tr).css('background','#faf6ca'); $('html, body').animate({ scrollTop: $('.'+hightlight_tr).offset().top }, 2000); diff --git a/app/Views/client_list.php b/app/Views/client_list.php index 1006aae..99dbeae 100644 --- a/app/Views/client_list.php +++ b/app/Views/client_list.php @@ -93,7 +93,7 @@ } // Move DataTable to the saved page and draw datatable_make.page(savedPage).draw(false); - $('.'+hightlight_tr).css('background','lightpink'); + $('.'+hightlight_tr).css('background','#faf6ca'); $('html, body').animate({ scrollTop: $('.'+hightlight_tr).offset().top }, 2000); diff --git a/app/Views/complaint_list.php b/app/Views/complaint_list.php index 41fba01..f2db43c 100644 --- a/app/Views/complaint_list.php +++ b/app/Views/complaint_list.php @@ -221,7 +221,7 @@ } // Move DataTable to the saved page and draw datatable_complaint.page(savedPage).draw(false); - $('.'+hightlight_tr).css('background','lightpink'); + $('.'+hightlight_tr).css('background','#faf6ca'); $('html, body').animate({ scrollTop: $('.'+hightlight_tr).offset().top }, 2000); diff --git a/app/Views/invoice_pdf_template.php b/app/Views/invoice_pdf_template.php index ae52d0e..e31c7d4 100644 --- a/app/Views/invoice_pdf_template.php +++ b/app/Views/invoice_pdf_template.php @@ -42,6 +42,8 @@ .term_condition {border-collapse: collapse;width: 100%;} .term_condition td {border: 0.5px solid black;padding: 8px;text-align: center;} + +

Tax Invoice

@@ -197,8 +199,8 @@ - Total Taxable Value - tax ?> + Subtotal + subtotal ?> @@ -213,10 +215,10 @@ Total - total ?> + total ?> - Amount Chargeable (in words) + Amount Chargeable (in words)

@@ -227,5 +229,70 @@ + + + \ No newline at end of file diff --git a/app/Views/jobs_list.php b/app/Views/jobs_list.php index 308ef1d..9067c64 100644 --- a/app/Views/jobs_list.php +++ b/app/Views/jobs_list.php @@ -151,7 +151,7 @@ } // Move DataTable to the saved page and draw datatable_jobcard.page(savedPage).draw(false); - $('.'+hightlight_tr).css('background','lightpink'); + $('.'+hightlight_tr).css('background','#faf6ca'); $('html, body').animate({ scrollTop: $('.'+hightlight_tr).offset().top }, 2000); diff --git a/app/Views/make_list.php b/app/Views/make_list.php index bf6cbce..365b55d 100644 --- a/app/Views/make_list.php +++ b/app/Views/make_list.php @@ -328,7 +328,7 @@ } // Move DataTable to the saved page and draw datatable_make.page(savedPage).draw(false); - $('.'+hightlight_tr).css('background','lightpink'); + $('.'+hightlight_tr).css('background','#faf6ca'); $('html, body').animate({ scrollTop: $('.'+hightlight_tr).offset().top }, 2000); diff --git a/app/Views/manufacturer_list.php b/app/Views/manufacturer_list.php index c35800d..d1fd80a 100644 --- a/app/Views/manufacturer_list.php +++ b/app/Views/manufacturer_list.php @@ -186,7 +186,7 @@ } // Move DataTable to the saved page and draw datatable_manufacturer.page(savedPage).draw(false); - $('.'+hightlight_tr).css('background','lightpink'); + $('.'+hightlight_tr).css('background','#faf6ca'); $('html, body').animate({ scrollTop: $('.'+hightlight_tr).offset().top }, 2000); diff --git a/app/Views/outsourcing_list.php b/app/Views/outsourcing_list.php index 8e55d78..8225bff 100644 --- a/app/Views/outsourcing_list.php +++ b/app/Views/outsourcing_list.php @@ -235,7 +235,7 @@ } // Move DataTable to the saved page and draw datatable_outsource.page(savedPage).draw(false); - $('.'+hightlight_tr).css('background','lightpink'); + $('.'+hightlight_tr).css('background','#faf6ca'); $('html, body').animate({ scrollTop: $('.'+hightlight_tr).offset().top }, 2000); diff --git a/app/Views/product_list.php b/app/Views/product_list.php index cb72c2a..e86cd46 100644 --- a/app/Views/product_list.php +++ b/app/Views/product_list.php @@ -150,7 +150,7 @@ } // Move DataTable to the saved page and draw data_table_set.page(savedPage).draw(false); - $('.'+hightlight_tr).css('background','lightpink'); + $('.'+hightlight_tr).css('background','#faf6ca'); $('html, body').animate({ scrollTop: $('.'+hightlight_tr).offset().top }, 2000); diff --git a/app/Views/purchase_form.php b/app/Views/purchase_form.php index d854f6e..75f81c4 100644 --- a/app/Views/purchase_form.php +++ b/app/Views/purchase_form.php @@ -274,9 +274,12 @@ $(document).ready(function() { // Event listener for vendor selection change $('.vendor-select').change(function() { + var purchase_order_id = ; var vendorId = $(this).val(); fetchVendorProducts(vendorId); + if(purchase_order_id == 0){ $('tbody').empty(); + } }); diff --git a/app/Views/purchase_list.php b/app/Views/purchase_list.php index 96a3429..db84d36 100644 --- a/app/Views/purchase_list.php +++ b/app/Views/purchase_list.php @@ -151,7 +151,7 @@ } // Move DataTable to the saved page and draw datatable_purchase_order.page(savedPage).draw(false); - $('.'+hightlight_tr).css('background','lightpink'); + $('.'+hightlight_tr).css('background','#faf6ca'); $('html, body').animate({ scrollTop: $('.'+hightlight_tr).offset().top }, 2000); diff --git a/app/Views/reorder_level_form.php b/app/Views/reorder_level_form.php index e4959bc..6826eb1 100644 --- a/app/Views/reorder_level_form.php +++ b/app/Views/reorder_level_form.php @@ -156,9 +156,7 @@ - - diff --git a/app/Views/return_list.php b/app/Views/return_list.php index 7ce1ca3..24f90d3 100644 --- a/app/Views/return_list.php +++ b/app/Views/return_list.php @@ -129,7 +129,7 @@ } // Move DataTable to the saved page and draw datatable_return_list.page(savedPage).draw(false); - $('.'+hightlight_tr).css('background','lightpink'); + $('.'+hightlight_tr).css('background','#faf6ca'); $('html, body').animate({ scrollTop: $('.'+hightlight_tr).offset().top }, 2000); diff --git a/app/Views/service_list.php b/app/Views/service_list.php index 613dc7f..b0d870e 100644 --- a/app/Views/service_list.php +++ b/app/Views/service_list.php @@ -94,7 +94,7 @@ } // Move DataTable to the saved page and draw datatable_service.page(savedPage).draw(false); - $('.'+hightlight_tr).css('background','lightpink'); + $('.'+hightlight_tr).css('background','#faf6ca'); $('html, body').animate({ scrollTop: $('.'+hightlight_tr).offset().top }, 2000); diff --git a/app/Views/user_list.php b/app/Views/user_list.php index 8ae4191..888b59a 100644 --- a/app/Views/user_list.php +++ b/app/Views/user_list.php @@ -108,7 +108,7 @@ } // Move DataTable to the saved page and draw datatable_user.page(savedPage).draw(false); - $('.'+hightlight_tr).css('background','lightpink'); + $('.'+hightlight_tr).css('background','#faf6ca'); $('html, body').animate({ scrollTop: $('.'+hightlight_tr).offset().top }, 2000); diff --git a/app/Views/vehicle_list.php b/app/Views/vehicle_list.php index 93c39ed..ed51a9a 100644 --- a/app/Views/vehicle_list.php +++ b/app/Views/vehicle_list.php @@ -101,7 +101,7 @@ } // Move DataTable to the saved page and draw datatable_vehicle.page(savedPage).draw(false); - $('.'+hightlight_tr).css('background','lightpink'); + $('.'+hightlight_tr).css('background','#faf6ca'); $('html, body').animate({ scrollTop: $('.'+hightlight_tr).offset().top }, 2000); diff --git a/app/Views/vendor_list.php b/app/Views/vendor_list.php index 072c43b..1531b5c 100644 --- a/app/Views/vendor_list.php +++ b/app/Views/vendor_list.php @@ -105,7 +105,7 @@ } // Move DataTable to the saved page and draw datatable_vendor.page(savedPage).draw(false); - $('.'+hightlight_tr).css('background','lightpink'); + $('.'+hightlight_tr).css('background','#faf6ca'); $('html, body').animate({ scrollTop: $('.'+hightlight_tr).offset().top }, 2000);