mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-24 16:28:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1842 from RuleDomain/quote-comments

Browse Source 
Expand comments for quotes and invoices add notice when customer is required
This commit is contained in:
FrancescoUK
2018-02-18 09:15:17 +00:00
committed by GitHub
parent 082bfeca88 21415ccb3c
commit a258a27d9b
6 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
application/controllers/Sales.php
View File

@@ -951,14 +951,27 @@ class Sales extends Secure_Controller
if($this->sale_lib->get_mode() == 'sale_invoice')
{
$data['mode_label'] = $this->lang->line('sales_invoice');
$data['customer_required'] = $this->lang->line('sales_customer_required');
}
elseif($this->sale_lib->get_mode() == 'sale_quote')
{
$data['mode_label'] = $this->lang->line('sales_quote');
$data['customer_required'] = $this->lang->line('sales_customer_required');
}
elseif($this->sale_lib->get_mode() == 'sale_work_order')
{
$data['mode_label'] = $this->lang->line('sales_work_order');
$data['customer_required'] = $this->lang->line('sales_customer_required');
}
elseif($this->sale_lib->get_mode() == 'return')
{
$data['mode_label'] = $this->lang->line('return');
$data['customer_required'] = $this->lang->line('sales_customer_optional');
}
else
{
$data['mode_label'] = $this->lang->line('sales_receipt');
$data['customer_required'] = $this->lang->line('sales_customer_optional');
}
return $this->xss_clean($data);
@@ -1047,19 +1060,29 @@ class Sales extends Secure_Controller
if($this->sale_lib->get_mode() == 'sale_invoice')
{
$data['mode_label'] = $this->lang->line('sales_invoice');
$data['customer_required'] = $this->lang->line('sales_customer_required');
}
elseif($this->sale_lib->get_mode() == 'sale_quote')
{
$data['mode_label'] = $this->lang->line('sales_quote');
$data['customer_required'] = $this->lang->line('sales_customer_required');
}
elseif($this->sale_lib->get_mode() == 'sale_work_order')
{
$data['mode_label'] = $this->lang->line('sales_work_order');
$data['customer_required'] = $this->lang->line('sales_customer_required');
}
elseif($this->sale_lib->get_mode() == 'return')
{
$data['mode_label'] = $this->lang->line('return');
$data['customer_required'] = $this->lang->line('sales_customer_optional');
}
else
{
$data['mode_label'] = $this->lang->line('sales_receipt');
$data['customer_required'] = $this->lang->line('sales_customer_optional');
}
$data = $this->xss_clean($data);
$this->load->view("sales/register", $data);

4
application/language/en-GB/sales_lang.php
View File

@@ -28,6 +28,8 @@ $lang["sales_customer_discount"] = "Discount";
$lang["sales_customer_email"] = "Email";
$lang["sales_customer_location"] = "Location";
$lang["sales_customer_mailchimp_status"] = "Mailchimp status";
$lang["sales_customer_optional"] = "(Optional)";
$lang["sales_customer_required"] = "(Required)";
$lang["sales_customer_total"] = "Total";
$lang["sales_date"] = "Sale Date";
$lang["sales_date_range"] = "Date Range";
@@ -119,7 +121,7 @@ $lang["sales_sale_by_invoice"] = "Sale by Invoice";
$lang["sales_sale_for_customer"] = "Customer:";
$lang["sales_sale_time"] = "Time";
$lang["sales_sales_tax"] = "Sales Tax";
$lang["sales_select_customer"] = "Select Customer (Optional)";
$lang["sales_select_customer"] = "Select Customer";
$lang["sales_send_invoice"] = "Send Invoice";
$lang["sales_send_quote"] = "Send Quote";
$lang["sales_send_receipt"] = "Send Receipt";

4
application/language/en-US/sales_lang.php
View File

@@ -28,6 +28,8 @@ $lang["sales_customer_discount"] = "Discount";
$lang["sales_customer_email"] = "Email";
$lang["sales_customer_location"] = "Location";
$lang["sales_customer_mailchimp_status"] = "Mailchimp status";
$lang["sales_customer_optional"] = "(Optional)";
$lang["sales_customer_required"] = "(Required)";
$lang["sales_customer_total"] = "Total";
$lang["sales_date"] = "Sale Date";
$lang["sales_date_range"] = "Date Range";
@@ -119,7 +121,7 @@ $lang["sales_sale_by_invoice"] = "Sale by Invoice";
$lang["sales_sale_for_customer"] = "Customer:";
$lang["sales_sale_time"] = "Time";
$lang["sales_sales_tax"] = "Sales Tax";
$lang["sales_select_customer"] = "Select Customer (Optional)";
$lang["sales_select_customer"] = "Select Customer";
$lang["sales_send_invoice"] = "Send Invoice";
$lang["sales_send_quote"] = "Send Quote";
$lang["sales_send_receipt"] = "Send Receipt";

3
application/views/sales/invoice.php
View File

@@ -214,7 +214,8 @@ $(document).ready(function()
<div id="sale_return_policy">
<h5>
<textarea rows="5" cols="6"><?php echo nl2br($this->config->item('payment_message')); ?></textarea>
<textarea rows="5" cols="6"><?php echo $this->lang->line('sales_comments'). ': ' . (empty($comments) ? $this->config->item('invoice_default_comments') : $comments); ?></textarea>
<textarea rows="5" cols="6"><?php echo $this->lang->line('sales_comments'). ': ' . $comments; ?></textarea>
<textarea rows="5" cols="6"><?php echo $this->config->item('invoice_default_comments'); ?></textarea>
</h5>
<?php echo nl2br($this->config->item('return_policy')); ?>
</div>

3
application/views/sales/quote.php
View File

@@ -189,7 +189,8 @@ if (isset($error_message))
<div id="terms">
<div id="sale_return_policy">
<h5>
<textarea rows="5" cols="6"><?php echo $this->lang->line('sales_comments'). ': ' . (empty($comments) ? $this->config->item('invoice_default_comments') : $comments); ?></textarea>
<textarea rows="5" cols="6"><?php echo $this->lang->line('sales_comments'). ': ' . $comments; ?></textarea>
<textarea rows="5" cols="6"><?php echo $this->config->item('invoice_default_comments'); ?></textarea>
</h5>
</div>
</div>

2
application/views/sales/register.php
View File

@@ -344,7 +344,7 @@ if(isset($success))
?>
<?php echo form_open($controller_name."/select_customer", array('id'=>'select_customer_form', 'class'=>'form-horizontal')); ?>
<div class="form-group" id="select_customer">
<label id="customer_label" for="customer" class="control-label" style="margin-bottom: 1em; margin-top: -1em;"><?php echo $this->lang->line('sales_select_customer'); ?></label>
<label id="customer_label" for="customer" class="control-label" style="margin-bottom: 1em; margin-top: -1em;"><?php echo $this->lang->line('sales_select_customer') . " " . $customer_required; ?></label>
<?php echo form_input(array('name'=>'customer', 'id'=>'customer', 'class'=>'form-control input-sm', 'value'=>$this->lang->line('sales_start_typing_customer_name')));?>
<button class='btn btn-info btn-sm modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url("customers/view"); ?>'