CHANGE_RETURNORDER_MODELE:GWM
This commit is contained in:
bitbucket
parent
181d8b4ad7
commit
39f7e6db9c
@ -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");
|
||||
|
||||
|
||||
@ -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 "<pre>";
|
||||
// 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 "<pre>";
|
||||
// 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)
|
||||
{
|
||||
|
||||
|
||||
@ -97,7 +97,6 @@
|
||||
session()->get('logged_user_role') == 'Job Card Manager' ||
|
||||
session()->get('logged_user_role') == 'Store Manager') {
|
||||
?>
|
||||
|
||||
<li>
|
||||
<a href="#sidebarLayouts1" data-toggle="collapse">
|
||||
<i class="mdi mdi-sale"></i>
|
||||
@ -121,6 +120,36 @@
|
||||
<?php } ?>
|
||||
|
||||
|
||||
<?php if(session()->get('logged_user_role') == 'Floor Manager' ||
|
||||
session()->get('logged_user_role') == 'Job Card Manager' ||
|
||||
session()->get('logged_user_role') == 'Store Manager') {
|
||||
?>
|
||||
<li>
|
||||
<a href="#sidebarLayouts3" data-toggle="collapse">
|
||||
<i class="fa fa-shopping-cart"></i>
|
||||
<span> Purchase </span>
|
||||
<span class="menu-arrow"></span>
|
||||
</a>
|
||||
<div class="collapse" id="sidebarLayouts3">
|
||||
<ul class="nav-second-level">
|
||||
<li>
|
||||
<a href="<?php echo base_url('purchase_index') ?>">Purchase Order</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="<?php echo base_url('return_order') ?>"> Purchase Return</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="<?php echo base_url('reorder_level_index') ?>">Reorder List</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="<?php echo base_url('vendor_index') ?>">Vendor</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</li>
|
||||
<?php } ?>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -130,7 +159,7 @@
|
||||
?>
|
||||
<li>
|
||||
<a href="#sidebarLayouts" data-toggle="collapse">
|
||||
<i class="ri-shopping-cart-fill"></i>
|
||||
<i class="fa fa-archive"></i>
|
||||
<span> Inventory </span>
|
||||
<span class="menu-arrow"></span>
|
||||
</a>
|
||||
@ -142,12 +171,6 @@
|
||||
<li>
|
||||
<a href="<?php echo base_url('service_index') ?>">Services</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="<?php echo base_url('vendor_index') ?>">Vendor</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="<?php echo base_url('purchase_index') ?>">Purchase Order</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</li>
|
||||
@ -159,27 +182,12 @@
|
||||
|
||||
|
||||
|
||||
<li>
|
||||
<a href="<?php echo base_url('spare_manufacturer_index') ?>">
|
||||
<i class="fas fa-cogs"></i>
|
||||
<span> Manufacturer </span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
|
||||
|
||||
|
||||
|
||||
<a href="<?php echo base_url('reorder_level_index') ?>">
|
||||
<i class="fas fa-angle-double-up"></i>
|
||||
<span> Reorder Level Products </span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="<?php echo base_url('return_order') ?>">
|
||||
<i class="fas fa-angle-double-up"></i>
|
||||
<span> Return Products </span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -207,6 +215,13 @@
|
||||
|
||||
|
||||
<li class="menu-title">Masters</li>
|
||||
|
||||
<li>
|
||||
<a href="<?php echo base_url('spare_manufacturer_index') ?>">
|
||||
<i class="fas fa-cogs"></i>
|
||||
<span> Manufacturer </span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="<?php echo base_url('make_index') ?>">
|
||||
<i class="fas fa-bicycle"></i>
|
||||
|
||||
@ -213,7 +213,7 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<?php if (!isset($purchase['status']) || $purchase['status'] !== 'Released') : ?>
|
||||
<?php if (!isset($purchase['status']) || $purchase['status'] !== 'Received') : ?>
|
||||
<button type="submit" id="editaddbutton"class="btn btn-primary">Submit</button>
|
||||
<?php endif; ?>
|
||||
|
||||
|
||||
@ -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';
|
||||
}
|
||||
?>">
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h4 class="header-title"></h4>
|
||||
<form action="<?= base_url() . "add_purchase"; ?>" method="post">
|
||||
<form action="<?= base_url() . "add_return_purchase"; ?>" method="post">
|
||||
<input type="hidden" id="purchase_order_id" name="purchase_order_id" value="<?= isset($purchase['purchase_order_id']) ? $purchase['purchase_order_id'] : '' ?>"readonly>
|
||||
<h4 class="header-title">Purchase Details :</h4><br>
|
||||
<div class="form-row">
|
||||
@ -134,10 +134,8 @@
|
||||
<th>Item Details</th>
|
||||
<th>Qty</th>
|
||||
<?php if (!empty($purchase["status"])): ?>
|
||||
<th>Returned</th>
|
||||
<?php endif; ?>
|
||||
<th hidden></th>
|
||||
<th></th>
|
||||
<th>Select Return product</th>
|
||||
<?php endif; ?>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -163,15 +161,10 @@
|
||||
<td style="width:5%;">
|
||||
<input type="number" class="form-control item-quantity" name="quantity[]" min="0" value="<?= isset($purchasechild['qty']) ? $purchasechild['qty'] : '' ?>">
|
||||
</td>
|
||||
<td style="width:2%;">
|
||||
<input type="checkbox" class="form-control-check-input" name="selected_items[]" value="<?= ($purchasechild['is_selected']) ? '0' : '1' ?>" <?php echo ($purchasechild['is_selected']) ? 'checked' : '1'; ?>>
|
||||
</td>
|
||||
<td style="width:2%;">
|
||||
<input type="checkbox" class="form-control-check-input" name="selected_items[]" value="<?= ($purchasechild['is_selected']) ? '0' : '1' ?>" <?php echo ($purchasechild['is_selected']) ? 'checked' : '1'; ?>>
|
||||
</td>
|
||||
<td style="width:2%;">
|
||||
<input type="checkbox" class="form-control-check-input" name="selected_items[]" value="<?= ($return['is_selected']) ? '0' : '1' ?>" <?php echo ($return['is_selected']) ? 'checked' : '1'; ?>>
|
||||
</td>
|
||||
<td style="width:7%;">
|
||||
<input type="checkbox" class="form-control-check-input" name="return_selected_items[]" value="">
|
||||
</td>
|
||||
|
||||
|
||||
<td hidden><input type="hidden" value="<?= isset($purchasechild['purchase_order_child_id']) ? $purchasechild['purchase_order_child_id'] : '' ?>"name="purchase_order_child_id[]"></td>
|
||||
<td style="width:5%;">
|
||||
|
||||
@ -53,8 +53,7 @@
|
||||
<th>Vendor Name</th>
|
||||
<th>Order Date</th>
|
||||
<th>Contact Person Details</th>
|
||||
<!-- <th>Contact Person Mobile</th> -->
|
||||
<th>Quantity</th>
|
||||
<th>Quantity</th>
|
||||
|
||||
<th>Status</th>
|
||||
<th>Actions</th>
|
||||
@ -63,7 +62,7 @@
|
||||
<tbody>
|
||||
|
||||
<?php foreach ($purchase as $value) :
|
||||
if ($value['status'] =='Released') : ?>
|
||||
if ($value['status'] =='Received') : ?>
|
||||
<tr>
|
||||
<td><?= $value['order_number']; ?></td>
|
||||
<td><?= $value['vendor_name']; ?></td>
|
||||
@ -72,24 +71,24 @@
|
||||
<?= $value['contact_person_mobile']; ?>
|
||||
<td><?= $value['product_count']; ?></td>
|
||||
<td class="<?php
|
||||
if ($value['status'] == 'Cancel') {
|
||||
echo 'cancelled-status';
|
||||
} elseif ($value['status'] == 'Draft') {
|
||||
echo 'created-status';
|
||||
} elseif ($value['status'] == 'Released') {
|
||||
echo 'paid-status';
|
||||
}
|
||||
?>">
|
||||
<?= $value['status']; ?>
|
||||
</td>
|
||||
if ($value['status'] == 'Cancel') {
|
||||
echo 'cancelled-status';
|
||||
} elseif ($value['status'] == 'Draft') {
|
||||
echo 'created-status';
|
||||
} elseif ($value['status'] == 'Received') {
|
||||
echo 'paid-status';
|
||||
}
|
||||
?>">
|
||||
<?= $value['status']; ?>
|
||||
</td>
|
||||
|
||||
<!-- Call the model method -->
|
||||
|
||||
<td>
|
||||
<a href="<?= "new_return/" . $value['purchase_order_id']; ?>" class="edit-button" title="Return"><i class="ri-arrow-left-circle-fill" style="font-size: 20px;"></i></a>
|
||||
<a href="<?= "delete_purchase/" . $value['purchase_order_id']; ?>" class="delete-button" title="Delete"><i class="ri-delete-bin-line" style="font-size: 20px;"></i></a>
|
||||
<a href="<?= "download_purchase_invoice/" . $value['purchase_order_id']; ?>" class="edit-button" title="Download"><i class="ri-download-2-fill" style="font-size: 20px;"></i></a>
|
||||
</td>
|
||||
<td>
|
||||
<a href="<?= "new_return/" . $value['purchase_order_id']; ?>" class="edit-button" title="Return"><i class="ri-arrow-left-circle-fill" style="font-size: 20px;"></i></a>
|
||||
<a href="<?= "delete_purchase/" . $value['purchase_order_id']; ?>" class="delete-button" title="Delete"><i class="ri-delete-bin-line" style="font-size: 20px;"></i></a>
|
||||
<a href="<?= "download_purchase_invoice/" . $value['purchase_order_id']; ?>" class="edit-button" title="Download"><i class="ri-download-2-fill" style="font-size: 20px;"></i></a>
|
||||
</td>
|
||||
|
||||
<?php endif?>
|
||||
<?php endforeach; ?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user