From f2659976a91a571c478a72137a763581b8e7a6dd Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Wed, 8 May 2024 08:21:55 +0530 Subject: [PATCH] CHANGE_MAKE_MODEL_REODERLIST : AADHAVAN --- app/Config/Routes.php | 3 +- app/Controllers/Complaint.php | 4 +- app/Controllers/Model.php | 7 +- app/Controllers/Purchase.php | 8 +- app/Controllers/Reorderlevel.php | 4 +- app/Controllers/Vendor.php | 12 ++ app/Models/PurchaseOrderModel.php | 2 +- app/Views/bike_model_list.php | 11 +- app/Views/make_list.php | 14 +- app/Views/reorder_level_form.php | 232 +++++++++++++++--------------- app/Views/reorder_level_list.php | 60 +++++++- 11 files changed, 218 insertions(+), 139 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 014c84f..adb1c3e 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -103,6 +103,7 @@ $routes->get('vendor_index/', 'Vendor::vendor_index'); $routes->post("add_vendor", "Vendor::add_vendor"); $routes->get("new_vendor/(:any)", "Vendor::new_vendor/$1"); $routes->get("delete_vendor/(:any)", "Vendor::delete_vendor/$1"); +$routes->get("get_product_by_vendor/(:any)", "Vendor::get_product_by_vendor/$1"); $routes->post("fetch_models", "Vendor::fetch_models"); //end Vendor @@ -140,7 +141,7 @@ $routes->get('dashboard', 'Users::dashboard'); // Model // $routes->get('bike_model_index/(:any)', 'Model::index/$1'); - $routes->post('create_model/(:any)', 'Model::create_model/(:any)'); + $routes->post('create_model/(:any)', 'Model::create_model/$1'); $routes->get('delete_model/(:any)', 'Model::delete_model/$1'); $routes->post('status_model', 'Model::status_model'); // Model End's// diff --git a/app/Controllers/Complaint.php b/app/Controllers/Complaint.php index e2870a4..d3cf001 100644 --- a/app/Controllers/Complaint.php +++ b/app/Controllers/Complaint.php @@ -35,12 +35,12 @@ class Complaint extends BaseController "labour_charge" => $this->request->getPost('labour_charge'), "cgst" => $this->request->getPost('tax')/2, "sgst" => $this->request->getPost('tax')/2, - "tax" => $this->request->getPost('tax') + "tax" => $this->request->getPost('tax'), ]; if (!$complaint_id) { $ComplaintModel = new ComplaintModel(); - // $data = $this->request->getPost(); + $data['business_id'] = $this->session->get('logged_user_business_id'); $inserted = $ComplaintModel->insert($data); if ($inserted) { $result = $data; diff --git a/app/Controllers/Model.php b/app/Controllers/Model.php index a24150b..39c629f 100644 --- a/app/Controllers/Model.php +++ b/app/Controllers/Model.php @@ -59,7 +59,7 @@ class Model extends BaseController } - public function create_model($model_id) + public function create_model($model_id = 0) { try { $make_id = $this->request->getPost('make_id'); @@ -70,9 +70,9 @@ class Model extends BaseController 'make_id' => $make_id, 'model_name' => $model_name ]; - - if (!$model_id) { + // print_r($model_id);die; + if (!$model_id) { try { $inserted = $BikemodelsModel->insert($data); } catch (\CodeIgniter\Database\Exceptions\DatabaseException $e) { @@ -90,6 +90,7 @@ class Model extends BaseController } } else{ + $updated = $BikemodelsModel->update($model_id ,$data); if ($updated) { $result = $data; diff --git a/app/Controllers/Purchase.php b/app/Controllers/Purchase.php index 0cd7c50..bc63b5a 100644 --- a/app/Controllers/Purchase.php +++ b/app/Controllers/Purchase.php @@ -291,24 +291,25 @@ class Purchase extends BaseController } // print_r($child_data);die; + if (!empty($purchase_order_child_id[$key])) { - + // print_r($purchase_order_child_id[$key]);die; $PurchaseOrderChildModel->update($purchase_order_child_id[$key], $child_data); } else { $PurchaseOrderChildModel->insert($child_data); - + // send purhase data through mail $VendorModel = new VendorModel(); $vendor = $VendorModel->where('vendor_id',$this->request->getPost('vendor_id'))->findAll(); $mail_status = $this->download_purchase_invoice($purchase_order_id, $vendor[0]['vendor_email']); + // echo $mail_status;die; $_SESSION['mail_status'] = $mail_status; } - } return redirect()->to('purchase_index'); @@ -417,6 +418,7 @@ public function download_purchase_invoice($purchase_order_id, $mail = null) // Fetch the invoice data based on $invoice_id $model = new PurchaseOrderModel(); $data = $model->getPurchasePdf($purchase_order_id); + $items = $model->getPurchaseOrderProductsForPdf($purchase_order_id); // Create an mPDF object $mpdf = new Mpdf([ diff --git a/app/Controllers/Reorderlevel.php b/app/Controllers/Reorderlevel.php index 20a1462..47070a4 100644 --- a/app/Controllers/Reorderlevel.php +++ b/app/Controllers/Reorderlevel.php @@ -27,12 +27,14 @@ class Reorderlevel extends BaseController $productModel = new ProductModel(); $reorder = $productModel->select('products.*, vendor.vendor_name as prefered_vendor_name, COUNT(vendor.vendor_name) as product_count') ->join('vendor', 'vendor.vendor_id = products.prefered_vendor') - ->where('products.qty_stock <= purchase_order_level') + ->where('products.qty_stock <= products.purchase_order_level') ->groupBy('products.prefered_vendor') ->orderBy('prefered_vendor_name', 'ASC') ->findAll(); // echo json_encode($reorder);die; $data['reorder']=$reorder; + // echo "
";
+        // print_r($reorder);die;
         return view('reorder_level_list',$data);
     }
     
diff --git a/app/Controllers/Vendor.php b/app/Controllers/Vendor.php
index 19f2edc..266119f 100644
--- a/app/Controllers/Vendor.php
+++ b/app/Controllers/Vendor.php
@@ -8,6 +8,7 @@ use App\Models\UsersModel;
 use App\Models\BikemakeModel;
 use App\Models\BikemodelsModel;
 use App\Models\ManufacturerModel;
+use App\Models\ProductModel;
 
 
 class Vendor extends BaseController
@@ -152,6 +153,17 @@ class Vendor extends BaseController
         // Send the formatted models as JSON response back to the client
         return $this->response->setJSON($formatted_models);
     }
+
+
+    public function get_product_by_vendor($vendor_id){
+
+        $productModel = new ProductModel();
+        $reorder = $productModel->select('products.*')
+                                ->where('products.qty_stock <= products.purchase_order_level')
+                                ->where('products.prefered_vendor',$vendor_id)
+                                ->findAll();
+        return json_encode($reorder);
+    }
     
     
     
diff --git a/app/Models/PurchaseOrderModel.php b/app/Models/PurchaseOrderModel.php
index c3b64da..aab9f6e 100644
--- a/app/Models/PurchaseOrderModel.php
+++ b/app/Models/PurchaseOrderModel.php
@@ -36,7 +36,7 @@ class PurchaseOrderModel extends Model
         ->join('branches as B','B.branch_id = purchase_order.branch_id','left')
         ->join('vendor as V','V.vendor_id = purchase_order.vendor_id','left')
         ->select('purchase_order.*')
-        ->select('V.vendor_name,V.contact_person_mobile1,V.address as vendor_address,V.city as vendor_city,V.state,V.postal_code as vendor_postal,B.branch_name ,B.address as company_address,B.city as company_city,B.state as company_state,B.postal_code as company_postal_code,B.mobile_no as company_mobile_no')
+        ->select('V.vendor_name,V.contact_person_mobile1,V.address as vendor_address,V.city as vendor_city,V.state,V.postal_code as vendor_postal,B.branch_name ,B.address as company_address,B.city as company_city,B.state as company_state,B.postal_code as company_postal_code,B.contact_1 as company_mobile_no')
         
         ->get()
         ->getResult();
diff --git a/app/Views/bike_model_list.php b/app/Views/bike_model_list.php
index 49c1a94..465f1ac 100644
--- a/app/Views/bike_model_list.php
+++ b/app/Views/bike_model_list.php
@@ -93,14 +93,16 @@
 
\ No newline at end of file