RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
vadivelJ96 2025-03-13 17:48:30 +05:30
commit 47744ec0b5
11 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Controllers/Sales.php
View File

@ -157,22 +157,13 @@ class Sales extends BaseController
if ($this->request->getMethod(true) === 'POST' && $this->request->getPost('btn_submit')) {
$from_date = $this->request->getPost('from_date');
$to_date = $this->request->getPost('to_date');
$hsn_number = $this->request->getPost('hsn_number');
$product_id = $this->request->getPost('product');
$client_id = $this->request->getPost('client');
$data['from_date'] = $this->request->getPost('from_date');
$data['to_date'] = $this->request->getPost('to_date');
$data['hsn_number'] = $this->request->getPost('hsn_number');
$data['product_id'] = $this->request->getPost('product');
$data['client_id'] = $this->request->getPost('client');
$headline .= ((isset($from_date) && isset($to_date)) && (!empty($from_date) && !empty($to_date))) ? $from_date . ' to ' . $to_date. ', ' : '';
$headline .= (isset($hsn_number) && !empty($hsn_number)) ? $hsn_number . ', ' : '';
$headline .= (isset($product_id) && !empty($product_id)) ? $this->ipinvoice_model->getProductName($product_id) . ', ' : '';
$headline .= (isset($client_id) && !empty($client_id)) ? $this->ipinvoice_model->getClientName($client_id) . ', ' : '';
$report = $this->ipinvoice_model->sales_report($from_date, $to_date, $hsn_number, $product_id, $client_id);
$report = $this->ipinvoice_model->sales_report($data['from_date'], $data['to_date'], $data['hsn_number'], $data['product_id'], $data['client_id']);
}
$data['hsn'] = $this->ipinvoice_model->getHsn();
$data['product'] = $this->ipinvoice_model->getProducts();

2
app/Models/Ipinvoice_model.php
View File

@ -130,7 +130,7 @@ class Ipinvoice_model extends Model
}
// Order by invoice number in descending order
$builder->orderBy('ip_invoices.invoice_number', 'DESC');
$builder->orderBy('ip_invoices.invoice_date_created', 'DESC');
$query = $builder->get();
return $query->getResult();

6
app/Views/EditservicePurchaseorder.php
View File

@ -1662,7 +1662,7 @@ if (!empty($getlogpodtl)) {
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<a class="btn btn-secondary" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save As Draft</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save As Draft</span></a>
<?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
@ -2253,7 +2253,7 @@ if (!empty($getlogpodtl)) {
</div>
<div class="modal-footer">
<div class="form-row">
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin:10px;">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin:10px;">Cancel</a>
<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
</div>
</div>
@ -2501,7 +2501,7 @@ if (!empty($getlogpodtl)) {
</div><br>
<div class="modal-footer">
<div class="form-row">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
</div>

2
app/Views/editCapitalPo.php
View File

@ -1597,7 +1597,7 @@ if (!empty($getlogpodtl)) {
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Save" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if($PONOStatus == PO_AMENDED){ ?>
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
<?php } else {

2
app/Views/editImportAmendPO.php
View File

@ -1234,7 +1234,7 @@ if (!empty($RequistionDetails)) {
</div>
<div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:15px">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:15px">Cancel</a>
<a class="btn btn-success font EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
<!--<a class="btn btn-success font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
</div>

2
app/Views/editRevenueAmendPO.php
View File

@ -1673,7 +1673,7 @@ if (!empty($INRSYMBOL)) {
<input type="button" class="btn btn-secondary" value="Cancel"
onClick="window.location ='amendmentpurchaseorder';">
<a class="btn btn-primary Save" onclick="Save(0)">&nbsp;&nbsp;<span
<a class="btn btn-success Save" onclick="Save(0)">&nbsp;&nbsp;<span
class="bold">Save as Draft</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
class="bold">Approve</span></a>

2
app/Views/editRevenuepurchaseorder.php
View File

@ -2958,7 +2958,7 @@ if (!empty($getlogpodtl)) {
<?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Save" ID="Submit"
<a class="btn btn-success Save" ID="Submit"
onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span

2
app/Views/editServiceAmendPO.php
View File

@ -1755,7 +1755,7 @@ foreach ($PaymentTerms as $TER) {
<div class="modal-footer" align="right">
<div class="form-group col-md-12">
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
</div>
</div>

6
app/Views/editimportpo.php
View File

@ -2010,7 +2010,7 @@ if (!empty($getlogpodtl)) {
</div>
<div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel">Cancel</a>
&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Import</span></a>
</div>
@ -2563,7 +2563,7 @@ if (!empty($getlogpodtl)) {
</div>
<div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
<a class="btn btn-success font EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
</div>
</form>
@ -3024,7 +3024,7 @@ if (!empty($getlogpodtl)) {
<div class="modal-footer">
<!-- <a class="btn btn-success font EditImport" ID="EditImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a> -->
<!--<a class="btn btn-success font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel">Cancel</a>
<!-- <a class="btn btn-success font UpdateImport" ID="UpdateImport"> &nbsp;&nbsp;<span class="bold">Update</span></a> -->
</div>
</form>

2
app/Views/purchaseorder.php
View File

@ -2311,7 +2311,7 @@ if (!empty($INRSYMBOL)) {
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" />
<div class="btn-container" style="text-align: right;">
<a class="btn btn-success Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div>

25
app/Views/report_sales.php
View File

@ -84,7 +84,7 @@
<?php echo 'From Date'; ?>
</label>
<div class="input-group">
<input name="from_date" id="max-date" class="form-control datepicker" autocomplete="off">
<input name="from_date" id="max-date" class="form-control datepicker" autocomplete="off" value="<?php if(isset($from_date)){ echo $from_date; } ?>">
</div>
</div>
@ -93,7 +93,7 @@
<?php echo 'To Date'; ?>
</label>
<div class="input-group">
<input name="to_date" id="min-date" class="form-control datepicker" autocomplete="off">
<input name="to_date" id="min-date" class="form-control datepicker" autocomplete="off" value="<?php if(isset($to_date)){ echo $to_date; } ?>">
</div>
</div>
@ -105,7 +105,7 @@
<option value="">Select HSN</option>
<?php
foreach ($hsn as $val): { ?>
<option value="<?php echo $val->hsn_or_sac; ?>"><?php echo $val->hsn_or_sac; ?></option>
<option <?php if(isset($hsn_number) && ($hsn_number == $val->hsn_or_sac)){ echo 'selected'; } ?> value="<?php echo $val->hsn_or_sac; ?>"><?php echo $val->hsn_or_sac; ?></option>
<?php }
endforeach; ?>
</select>
@ -119,7 +119,7 @@
<option value="">Select Product</option>
<?php
foreach ($product as $val): { ?>
<option value="<?php echo $val->product_id; ?>"><?php echo $val->product_name; ?></option>
<option <?php if(isset($product_id) && ($product_id == $val->product_id)){ echo 'selected'; } ?> value="<?php echo $val->product_id; ?>"><?php echo $val->product_name; ?></option>
<?php }
endforeach; ?>
</select>
@ -133,15 +133,18 @@
<option value="">Select Client</option>
<?php
foreach ($client as $val): { ?>
<option value="<?php echo $val->client_id; ?>"><?php echo $val->client_name; ?></option>
<option <?php if(isset($client_id) && ($client_id == $val->client_id)){ echo 'selected'; } ?> value="<?php echo $val->client_id; ?>"><?php echo $val->client_name; ?></option>
<?php }
endforeach; ?>
</select>
</div>
<div class="col-md-6"></div>
<div class="col-md-6 text-right"><br>
<input type="submit" class="btn btn-success" name="btn_submit"
value="View Report">
<div class="col-md-8"></div>
<div class="col-md-4 text-right">
<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('sales_report') ?>';">
<input type="submit" class="btn btn-success m-2" name="btn_submit" value="View Report">
</div>
</div>
@ -267,9 +270,7 @@
[10, 20, 30, 50, "All"]
], // Rows per page options
responsive: true, // Responsive table
order: [
[0, 'desc']
], // Default ordering (column index 0, descending)
ordering : false,
language: {
paginate: {
next: '<i class="fas fa-angle-right"></i>', // Next button icon