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

Add fixes for register + receiving validation (#458)

Browse Source
This commit is contained in:
jekkos
2016-07-07 21:11:33 +02:00
parent 3af19daa0e
commit 0f88d6462d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Receivings.php
View File

@@ -101,7 +101,7 @@ class Receivings extends Secure_Controller
function numeric($str)
{
return (bool) preg_match('/^[\-+]?[0-9]*[\.,]?[0-9]+$/', $str);
return (bool) preg_match('/^[\-+]?([0-9]*[\.,])*?[0-9]+$/', $str);
}
public function edit_item($item_id)

4
application/controllers/Sales.php
View File

@@ -180,7 +180,7 @@ class Sales extends Secure_Controller
public function add_payment()
{
$data = array();
$this->form_validation->set_rules('amount_tendered', 'lang:sales_amount_tendered', 'trim|required|numeric');
$this->form_validation->set_rules('amount_tendered', 'lang:sales_amount_tendered', 'trim|required|callback_numeric');
$payment_type = $this->input->post('payment_type');
$amount_tendered = parse_decimals($this->input->post('amount_tendered'));
@@ -282,7 +282,7 @@ class Sales extends Secure_Controller
function numeric($str)
{
return (bool) preg_match('/^[\-+]?[0-9]*[\.,]?[0-9]+$/', $str);
return (bool) preg_match('/^[\-+]?([0-9]*[\.,])*?[0-9]+$/', $str);
}
public function edit_item($item_id)

10
application/libraries/Sale_lib.php
View File

@@ -180,7 +180,7 @@ class Sale_lib
$subtotal = bcadd($payments['payment_amount'], $subtotal, PRECISION);
}
return to_currency_no_money($subtotal);
return $subtotal;
}
// Multiple Payments
@@ -189,7 +189,7 @@ class Sale_lib
$payment_total = $this->get_payments_total();
$sales_total = $this->get_total();
return to_currency_no_money(bcsub($sales_total, $payment_total, PRECISION));
return bcsub($sales_total, $payment_total, PRECISION);
}
public function get_customer()
@@ -306,7 +306,7 @@ class Sale_lib
$updatekey = $item['line'];
if(!$item_info->is_serialized)
{
$quantity += $items[$updatekey]['quantity'];
$quantity = bcadd($quantity, $items[$updatekey]['quantity']);
}
}
}
@@ -603,7 +603,7 @@ class Sale_lib
public function get_subtotal($include_discount=FALSE, $exclude_tax=FALSE)
{
$subtotal = $this->calculate_subtotal($include_discount, $exclude_tax);
return to_currency_no_money($subtotal);
return $subtotal;
}
public function get_item_total_tax_exclusive($item_id, $quantity, $price, $discount_percentage, $include_discount = FALSE)
@@ -687,7 +687,7 @@ class Sale_lib
}
}
return to_currency_no_money($total);
return $total;
}
public function validate_item(&$item_id)