From 39f7e6db9cab6fbebce236e3c984bdde3a111e56 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Wed, 17 Apr 2024 09:20:58 +0530 Subject: [PATCH] CHANGE_RETURNORDER_MODELE:GWM --- app/Config/Routes.php | 3 +- app/Controllers/ReturnOrder.php | 73 ++++++++++---------------------- app/Views/layout/header.php | 69 ++++++++++++++++++------------ app/Views/purchase_form.php | 2 +- app/Views/purchase_list.php | 2 +- app/Views/return_order_form.php | 21 +++------ app/Views/return_order_liist.php | 35 ++++++++------- 7 files changed, 92 insertions(+), 113 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 2eb3fc3..40fa6f4 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -133,5 +133,6 @@ $routes->get('rise_order/(:any)', 'Reorderlevel::rise_order/$1'); $routes->get('return_order_index', 'ReturnOrder::return_order_index'); $routes->get('return_order', 'ReturnOrder::return_order'); $routes->get("new_return/(:any)", "ReturnOrder::new_return/$1"); +$routes->post("add_return_purchase", "ReturnOrder::add_return_purchase"); $routes->get('get_vendor/(:any)', 'Purchase::get_vendor/$1'); -$routes->post("add_purchase", "Purchase::add_purchase"); + diff --git a/app/Controllers/ReturnOrder.php b/app/Controllers/ReturnOrder.php index 1f8a318..6ec864d 100644 --- a/app/Controllers/ReturnOrder.php +++ b/app/Controllers/ReturnOrder.php @@ -18,6 +18,7 @@ class ReturnOrder extends BaseController public function __construct() { $this->session = session(); + $this->returnModel = new ReturnModel(); } public function return_order_index() @@ -29,9 +30,9 @@ class ReturnOrder extends BaseController // print_r($product);die; $data['purchase']=$purchase; - $ReturnModel = new ReturnModel(); + - $return = $ReturnModel->findAll(); + $return = $this->returnModel->findAll(); $data['return']=$return; // echo "
";
         // print_r($data);die;
@@ -53,34 +54,8 @@ class ReturnOrder extends BaseController
     }
     public function new_return($purchase_order_id)
     {
-        if ($purchase_order_id === '0') {
-           
-           
-            $PurchaseOrderModel = new PurchaseOrderModel();
-            $data['purchase'] =$PurchaseOrderModel->getdata($this->session->get('logged_user_branch_id'));
-            // print_r($data);die;
-            $VendorModel = new VendorModel();
-            $vendor = $VendorModel->findAll();
 
-
-            $BranchModel = new BranchModel();
-            $BusinessModel = new BusinessModel();
-            $branch = $BranchModel->where('branch_id', $this->session->get('logged_user_branch_id'))->get()->getRowArray();
-            $business = $BusinessModel->where('business_id', $this->session->get('logged_user_business_id'))->get()->getRowArray();
-            $ProductModel = new ProductModel();
-            $product=$ProductModel
-            ->where('isactive',1)
-            ->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll();
-            $data['product']=$product;   
-            $data['branch'] = $branch;  
-            $data['business'] = $business;  
-
-            $data['page_name']="Add Purchase Order";
-            $data['vendor']=$vendor;
-
-            $data['vendor_id'] = [];
-        } else if ($purchase_order_id !== '0') {
-            $data['page_name']="Edit Purchase Order";
+            $data['page_name']="Create Return Order";
 
             $PurchaseOrderModel = new PurchaseOrderModel();
             $purchase=$PurchaseOrderModel->where('purchase_order_id', $purchase_order_id)->get()->getRowArray();
@@ -93,16 +68,16 @@ class ReturnOrder extends BaseController
             $data['vendor'] = $vendor;
 
             $data['vendor_id'] = $purchase['vendor_id'];
-// print_r($vendor);die;
+
             $vendorId=$purchase['vendor_id'];
             $encodedVendorId = json_encode([$vendorId]);
             $productModel = new ProductModel();
 
-    // Query the database to find the product based on make_id and model_id
-    $product = $productModel->where('JSON_CONTAINS(vendor, \'' . $encodedVendorId . '\')', null, false)
-                            ->findAll();
-    $data['product']=$product;
-// print_r($product);die;
+            // Query the database to find the product based on make_id and model_id
+            $product = $productModel->where('JSON_CONTAINS(vendor, \'' . $encodedVendorId . '\')', null, false)
+                                    ->findAll();
+            $data['product']=$product;
+
 
 
 
@@ -110,13 +85,11 @@ class ReturnOrder extends BaseController
             $purchase_product=$PurchaseOrderChildModel->where('purchase_order_id', $purchase_order_id)->findAll();
             $data['purchase_product']=$purchase_product;
 
-        }
-        // echo "
";
-        // print_r($data);die;
-        echo view('return_order_form',$data);
+      
+           echo view('return_order_form',$data);
     }
 
-    public function add_purchase()
+    public function add_return_purchase()
     {
         $PurchaseOrderModel = new PurchaseOrderModel();
         $ProductModel = new ProductModel();
@@ -140,9 +113,9 @@ class ReturnOrder extends BaseController
             'branch_id'=> $this->session->get('logged_user_branch_id'),
         ];
 
-    //  print_r($data);die;
+       print_r($data);die;
         $purchase_order_id = $this->request->getPost('purchase_order_id');
-        //  echo  $purchase_order_id;die;
+       
         if (!empty($purchase_order_id)) {
         
             $PurchaseOrderModel->update($purchase_order_id, $data);
@@ -151,22 +124,18 @@ class ReturnOrder extends BaseController
             $PurchaseOrderModel->insert($data);
             $purchase_order_id = $PurchaseOrderModel->getInsertID(); 
         }
-        $orderNumber = 'PO' .  str_pad($purchase_order_id, 8, '0', STR_PAD_LEFT);
-        // print_r($orderNumber);die;
-            // Update sales order with generated order number
+        $orderNumber = 'RO' .  str_pad($purchase_order_id, 8, '0', STR_PAD_LEFT);
+       
             $PurchaseOrderModel->update($purchase_order_id, ['order_number' => $orderNumber]);
-        //  print_r();die;
-            // Prepare data for sales order product
+        
             $product_ids = $this->request->getPost('item_details');
             $quantities = $this->request->getPost('quantity');
-            // $discounts = $this->request->getPost('discount_amount');
-            // $discount_types = $this->request->getPost('discount_type');
             $amounts = $this->request->getPost('amount');
             $itemtax=$this->request->getPost('item-tax');
             $unitprice=$this->request->getPost('unit-price');
-            $selected_items=$this->request->getPost('selected_items');
+            $selected_items=$this->request->getPost('return_selected_items');
             $purchase_order_child_id = $this->request->getPost('purchase_order_child_id');
-        // print_r($selected_items);die;
+         print_r($selected_items);die;
         
         // print_r($status);die;
         $status = $this->request->getPost('purchase_status');
@@ -215,6 +184,8 @@ class ReturnOrder extends BaseController
         
         return redirect()->to('purchase_index');
     }
+
+
     private function addBackProductQuantity($ProductModel, $product_id, $sold_qty)
 {
   
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 61545e2..d15d37b 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -97,7 +97,6 @@
                                 session()->get('logged_user_role') == 'Job Card Manager' ||
                                 session()->get('logged_user_role') == 'Store Manager') { 
                         ?>
-
                             
  • 
                                 
                                   
@@ -121,6 +120,36 @@
                         
 
 
+                        get('logged_user_role') == 'Floor Manager' || 
+                                session()->get('logged_user_role') == 'Job Card Manager' ||
+                                session()->get('logged_user_role') == 'Store Manager') { 
+                        ?>
+                            
  • 
+                                
+                                  
+                                     Purchase 
+                                    
+                                
+                                
    
+                                    
+                                
    
+                            
    • 
+                        
+
+
    
 
 
@@ -130,7 +159,7 @@
                         ?>
                             
  • 
                                 
-                                  
+                                  
                                      Inventory 
                                     
                                 
@@ -142,12 +171,6 @@
                                         
  • 
                                             Services
                                         
    • 
-                                        
  • 
-                                            Vendor
-                                        
    • 
-                                        
  • 
-                                            Purchase Order
-                                        
    • 
                                     
                                 
                             
@@ -159,27 +182,12 @@
                            
        
         
-                            
  • 
-                            
-                                
-                                     Manufacturer 
-                                
-                            
    • 
-                            
  • 
-
+                           
                             
 
-                            
-                                
-                                     Reorder Level Products 
-                                
-                                
    • 
-                                
  • 
-                            
-                                
-                                     Return Products 
-                                
-                                
    • 
+                            
+                      
+                           
                             
                             
 
@@ -207,6 +215,13 @@
 
 
                             
  • Masters
    •   
+
+                            
  • 
+                                
+                                
+                                     Manufacturer 
+                                
+                            
    • 
                             
  • 
                             
                                 
diff --git a/app/Views/purchase_form.php b/app/Views/purchase_form.php
index f80b4e8..05592a4 100644
--- a/app/Views/purchase_form.php
+++ b/app/Views/purchase_form.php
@@ -213,7 +213,7 @@
 
                     
                     
-        
+        
     
     
 
diff --git a/app/Views/purchase_list.php b/app/Views/purchase_list.php
index c171e8e..dcd6009 100644
--- a/app/Views/purchase_list.php
+++ b/app/Views/purchase_list.php
@@ -76,7 +76,7 @@
         echo 'cancelled-status';
     } elseif ($value['status'] == 'Draft') {
         echo 'created-status';
-    } elseif ($value['status'] == 'Released') {
+    } elseif ($value['status'] == 'Received') {
         echo 'paid-status';
     }
 ?>">
diff --git a/app/Views/return_order_form.php b/app/Views/return_order_form.php
index c683f97..b6c412c 100644
--- a/app/Views/return_order_form.php
+++ b/app/Views/return_order_form.php
@@ -21,7 +21,7 @@
         
    
             
    
                 
    
-                
    " method="post">
+                " method="post">
                 
                 
    Purchase Details :

    
                     
    
@@ -134,10 +134,8 @@
             Item Details
             Qty
             
-    Returned
-
-            
-            
+            Select Return product
+            
         
     
     
@@ -163,15 +161,10 @@
                 
                     
                 
-                
-    >
-
-
-    >
-
-
-    >
-
+                
+                
+                
+
 
                 
                 
diff --git a/app/Views/return_order_liist.php b/app/Views/return_order_liist.php
index 5484025..b33ef32 100644
--- a/app/Views/return_order_liist.php
+++ b/app/Views/return_order_liist.php
@@ -53,8 +53,7 @@
                                 Vendor Name
                                 Order Date
                                 Contact Person Details
-                               
-                               Quantity
+                                Quantity
                                          
                                Status      
                                Actions                              
@@ -63,7 +62,7 @@
                         
                            
                         
+                              if ($value['status'] =='Received') : ?>
                             
                                 
                                 
@@ -72,24 +71,24 @@
                                 
                                 
                                 
-    
-
+                                    if ($value['status'] == 'Cancel') {
+                                        echo 'cancelled-status';
+                                    } elseif ($value['status'] == 'Draft') {
+                                        echo 'created-status';
+                                    } elseif ($value['status'] == 'Received') {
+                                        echo 'paid-status';
+                                    }
+                                ?>">
+                                    
+                                
                             
                                 
                                    
-                                    
-    " class="edit-button" title="Return">     
-    " class="delete-button" title="Delete">     
-    " class="edit-button" title="Download">
-
+                                
+                                    " class="edit-button" title="Return">     
+                                    " class="delete-button" title="Delete">     
+                                    " class="edit-button" title="Download">
+