diff --git a/app/Controllers/Purchase.php b/app/Controllers/Purchase.php index ac68d25..0a51b7c 100644 --- a/app/Controllers/Purchase.php +++ b/app/Controllers/Purchase.php @@ -85,16 +85,16 @@ class Purchase extends BaseController $data['vendor'] = $vendor; $data['vendor_id'] = $purchase['vendor_id']; -// print_r($vendor);die; + // 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; + // print_r($product);die; @@ -197,6 +197,7 @@ class Purchase extends BaseController $PurchaseOrderChildModel->update($purchase_order_child_id[$key], $child_data); } else { + $PurchaseOrderChildModel->insert($child_data); } diff --git a/app/Controllers/Reorderlevel.php b/app/Controllers/Reorderlevel.php index 1266a82..dc82abc 100644 --- a/app/Controllers/Reorderlevel.php +++ b/app/Controllers/Reorderlevel.php @@ -4,9 +4,11 @@ namespace App\Controllers; use App\Models\ProductModel; use App\Models\VendorModel; +use App\Models\PurchaseOrderModel; +use App\Models\PurchaseOrderChildModel; -class Reorderlevel extends BaseController +class Reorderlevel extends BaseController { public $session; @@ -26,18 +28,28 @@ class Reorderlevel extends BaseController // print_r($reorder);die; $data['reorder']=$reorder; - + // echo "
";
+        // print_r($data);die;
         return view('reorder_level_list',$data);
     }
     public function rise_order($product_id)
     {
+        $data['page_name']="Rise Order";
         $ProductModel = new ProductModel();
         $products=$ProductModel->where('product_id', $product_id)->get()->getRowArray();
         $data['products']=$products;
-       $vendorid= $products['prefered_vendor'];
-       $VendorModel = new VendorModel();
-       $vendor=$VendorModel->where('vendor_id',$vendorid)->findAll();
-       print_r($vendor);die;
+        // echo "
";
+        // print_r($products);die;
+        $vendorid= $products['prefered_vendor'];
+        $VendorModel = new VendorModel();
+        $vendor=$VendorModel->where('vendor_id',$vendorid)->findAll();
+        $data['vendor']=$vendor;
+
+        $PurchaseOrderModel = new PurchaseOrderModel();
+        $purchase=$PurchaseOrderModel->where('vendor_id',$vendorid)->first();
+
+        $data['purchase']=$purchase;
+    return view('reorder_level_form',$data);
     }
 }
 ?>
\ No newline at end of file
diff --git a/app/Views/reorder_level_form.php b/app/Views/reorder_level_form.php
index 7852a4a..517c4d1 100644
--- a/app/Views/reorder_level_form.php
+++ b/app/Views/reorder_level_form.php
@@ -1,716 +1,165 @@
 
 
-
+ -
-
-
-
-

-
" method="post"> - -

Purchase Details :


-
-
- - -
- - - -
- - -
-
- - -
-
- - -
-
- - -
-
-

Billing Addresss :


-
-
- - -
-
- - -
-
- - -
-
- - -
- -

-

Shipping Addresss :


-
-
- - -
-
- - -
-
- - -
-
- - -
-

- -
-
-

Item Details

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Item DetailsQtyRateTaxAmount
- - - - - - - - - - -
-
- - - -
-
+
+
+
+
+

+ " method="post"> + +

Purchase Details :


-
-
-

Calculation

-
- - -
-
- - - -
- +
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+
+

Billing Addresss :


+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+

+

Shipping Addresss :


+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+

+
+
+

Item Details

+
+ + + + + - -
- - -
- - + + + + + + + + + + + + + + +
Item DetailsQty
+ + + + +
+
+ + + +
+
+

Terms & Condition :


+
+
+ +
-
-

Terms & Condition :


-
-
- - - - - -
-
- - - - - + + + + +
+
-
+ + -
- - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/Views/reorder_level_list.php b/app/Views/reorder_level_list.php index af458bd..c8fb694 100644 --- a/app/Views/reorder_level_list.php +++ b/app/Views/reorder_level_list.php @@ -49,7 +49,7 @@ - " class="edit-button">Rise + " class="edit-button">Rise