GWM:Merge
This commit is contained in:
parent
659189bf73
commit
a5d75b3d03
@ -33,7 +33,7 @@ class Sales extends BaseController
|
|||||||
|
|
||||||
|
|
||||||
if ($sales_order_id === '0') {
|
if ($sales_order_id === '0') {
|
||||||
$data['page_name']="Add Sale";
|
$data['page_name']="Create Sales Order";
|
||||||
$data['sales'] = [];
|
$data['sales'] = [];
|
||||||
$ClientModel = new ClientModel();
|
$ClientModel = new ClientModel();
|
||||||
$client=$ClientModel
|
$client=$ClientModel
|
||||||
@ -47,7 +47,7 @@ class Sales extends BaseController
|
|||||||
$data['product']=$product;
|
$data['product']=$product;
|
||||||
$data['client']=$client;
|
$data['client']=$client;
|
||||||
} else if ($sales_order_id !== '0') {
|
} else if ($sales_order_id !== '0') {
|
||||||
$data['page_name']="Edit Sale";
|
$data['page_name']="Edit Sale Order";
|
||||||
$ClientModel = new ClientModel();
|
$ClientModel = new ClientModel();
|
||||||
$client=$ClientModel->where('isactive',1)->findAll();
|
$client=$ClientModel->where('isactive',1)->findAll();
|
||||||
$SalesOrderModel = new SalesOrderModel();
|
$SalesOrderModel = new SalesOrderModel();
|
||||||
|
|||||||
@ -79,7 +79,7 @@
|
|||||||
session()->get('logged_user_role') == 'Store Manager') { ?>
|
session()->get('logged_user_role') == 'Store Manager') { ?>
|
||||||
<li>
|
<li>
|
||||||
<a href="<?php echo base_url('client_index') ?>">
|
<a href="<?php echo base_url('client_index') ?>">
|
||||||
<i class="ri-message-2-line"></i>
|
<i class="mdi mdi-clipboard-account"></i>
|
||||||
<span> Client </span>
|
<span> Client </span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
|
||||||
<form action="<?= base_url() . "add_sales"; ?>" method="post">
|
<form action="<?= base_url() . "add_sales"; ?>" method="post">
|
||||||
<h4 class="header-title">Sales Order Details :</h4><br>
|
<!-- <h4 class="header-title">Sales Order Details :</h4><br> -->
|
||||||
|
|
||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
<div class="form-group col-md-6">
|
<div class="form-group col-md-6">
|
||||||
@ -46,34 +46,35 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div><br>
|
</div><br>
|
||||||
<h4 class="header-title">Address Details :</h4><br>
|
<h4 class="header-title">Billing Address Details :</h4><br>
|
||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
<div class="form-group col-md-6">
|
<div class="form-group col-md-4">
|
||||||
<label for="inputPassword4" class="col-form-label">Billing Address</label>
|
<label for="inputPassword4" class="col-form-label">Address</label>
|
||||||
<input type="text" class="form-control" name="billing_address" placeholder="Address"value="<?= isset($sales['billing_address']) ? $sales['billing_address'] : '' ?>" >
|
<input type="text" class="form-control" name="billing_address" placeholder="Address"value="<?= isset($sales['billing_address']) ? $sales['billing_address'] : '' ?>" >
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<input type="hidden" id="sales_order_id" name="sales_order_id" value="<?= isset($sales['sales_order_id']) ? $sales['sales_order_id'] : '' ?>"readonly>
|
<input type="hidden" id="sales_order_id" name="sales_order_id" value="<?= isset($sales['sales_order_id']) ? $sales['sales_order_id'] : '' ?>"readonly>
|
||||||
|
|
||||||
<div class="form-group col-md-6">
|
<div class="form-group col-md-4">
|
||||||
<label for="inputPassword4" class="col-form-label">City</label>
|
<label for="inputPassword4" class="col-form-label">City</label>
|
||||||
<input type="text" class="form-control" name="city" placeholder="City"value="<?= isset($sales['billing_city']) ? $sales['billing_city'] : '' ?>" >
|
<input type="text" class="form-control" name="city" placeholder="City"value="<?= isset($sales['billing_city']) ? $sales['billing_city'] : '' ?>" >
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group col-md-6">
|
<div class="form-group col-md-4">
|
||||||
<label for="inputPassword4" class="col-form-label">State</label>
|
<label for="inputPassword4" class="col-form-label">State</label>
|
||||||
<input type="text" class="form-control" name="state" placeholder="State"value="<?= isset($sales['billing_state']) ? $sales['billing_state'] : '' ?>" >
|
<input type="text" class="form-control" name="state" placeholder="State"value="<?= isset($sales['billing_state']) ? $sales['billing_state'] : '' ?>" >
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group col-md-6">
|
<div class="form-group col-md-4">
|
||||||
<label for="inputPassword4" class="col-form-label">Pin Code</label>
|
|
||||||
<input type="text" class="form-control" name="postalcode" placeholder="Pin Code"value="<?= isset($sales['billing_postal_code']) ? $sales['billing_postal_code'] : '' ?>" maxlength="6" minlength="6">
|
|
||||||
</div>
|
|
||||||
<div class="form-group col-md-6">
|
|
||||||
<label for="inputPassword4" class="col-form-label">Country</label>
|
<label for="inputPassword4" class="col-form-label">Country</label>
|
||||||
<input type="text" class="form-control" name="country" placeholder="Country"value="<?= isset($sales['billing_country']) ? $sales['billing_country'] : '' ?>" >
|
<input type="text" class="form-control" name="country" placeholder="Country"value="<?= isset($sales['billing_country']) ? $sales['billing_country'] : '' ?>" >
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group col-md-6">
|
<div class="form-group col-md-4">
|
||||||
<label for="inputPassword4" class="col-form-label">Mobile</label>
|
<label for="inputPassword4" class="col-form-label">Pin Code</label>
|
||||||
|
<input type="text" class="form-control" name="postalcode" placeholder="Pin Code"value="<?= isset($sales['billing_postal_code']) ? $sales['billing_postal_code'] : '' ?>" maxlength="6" minlength="6">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group col-md-4">
|
||||||
|
<label for="inputPassword4" class="col-form-label">Mobile No</label>
|
||||||
<input type="text" class="form-control" name="mobile_no" placeholder="Mobile"value="<?= isset($sales['mobile_no']) ? $sales['mobile_no'] : '' ?>" >
|
<input type="text" class="form-control" name="mobile_no" placeholder="Mobile"value="<?= isset($sales['mobile_no']) ? $sales['mobile_no'] : '' ?>" >
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user