From 6da79d08e31de7c18c20ee177ca96ff41d09b13c Mon Sep 17 00:00:00 2001
From: Smart <kamali@watermelon.us>
Date: Fri, 27 Sep 2024 10:47:08 +0530
Subject: [PATCH] Merge code : GWM

---
 app/Controllers/Products.php | 20 +++++++++++++-------
 app/Models/ProductModel.php  |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/Controllers/Products.php b/app/Controllers/Products.php
index 9f583fc..ece7133 100755
--- a/app/Controllers/Products.php
+++ b/app/Controllers/Products.php
@@ -151,12 +151,15 @@ class Products extends BaseController
         $ProductModel = new ProductModel();
     
         $tax= $this->request->getPost('tax')/2;
-        // print_r($this->request->getPost());die;
-
-        if ($this->request->getPost('per') != 'ml') {
-            $ml = 0;
-        }else{
+        $ml = 0; $box = 0; $qty_per_box = 0; $barrel = 0; $ltr_per_barrel = 0;
+        if ($this->request->getPost('per') == 'ml') {
             $ml = $this->request->getPost('ml');
+        }else if ($this->request->getPost('per') == 'box'){
+            $box = $this->request->getPost('box');
+            $qty_per_box = $this->request->getPost('qty_per_box');
+        }else if ($this->request->getPost('per') == 'barrel'){
+            $barrel = $this->request->getPost('barrel');
+            $ltr_per_barrel = $this->request->getPost('ltr_per_barrel');
         }
 
         $data = [
@@ -170,7 +173,6 @@ class Products extends BaseController
             'cgst' =>  $tax,
             'purchase_cost' => $this->request->getPost('purchase_cost'),
             'qty_stock'=> $this->request->getPost('qty_in_stock'),
-            'qty_in_demand'=> $this->request->getPost('qty_in_demand'),
             'description' => $this->request->getPost('description'),
             'vendor' =>json_encode( $this->request->getPost('vendor')),
             'purchase_order_level' => $this->request->getPost('purchase_order_level'),
@@ -188,7 +190,11 @@ class Products extends BaseController
 
             'total_amount' => $this->request->getPost('total_amount'),
             'per' => $this->request->getPost('per'),
-            'ml' => $ml
+            'ml' => $ml,
+            'box' => $box,
+            'qty_per_box' => $qty_per_box,
+            'barrel' => $barrel,
+            'ltr_per_barrel' => $ltr_per_barrel
         ];
 
         $product_id = $this->request->getPost('product_id');
diff --git a/app/Models/ProductModel.php b/app/Models/ProductModel.php
index b903059..b8e6f6c 100755
--- a/app/Models/ProductModel.php
+++ b/app/Models/ProductModel.php
@@ -9,7 +9,7 @@ class ProductModel extends Model
     'quality','product_name','branch_id','prefered_vendor','product_category','mfr_part_no','purchase_order_level',
     'unit_price','commision_rate','sgst','cgst','purchase_cost','usage_unit','vendor','qty_stock','reorder_level',
     'handler','qty_in_demand','product_image','description','specification','hsn_sac','isactive','total_amount',
-    'per','ml'];
+    'per','ml','box','qty_per_box','barrel','ltr_per_barrel'];
     
     
     public function getTax()