mirror of
https://github.com/opensourcepos/opensourcepos.git
synced 2026-07-11 23:46:35 -04:00
Multiple total disconuts are shown correctly now
This commit is contained in:
jekkos
@@ -27,7 +27,8 @@ $lang["sales_delete_successful"] = "You have successfully deleted a sale";
|
||||
$lang["sales_delete_unsuccessful"] = "You have unsuccessfully deleted a sale";
|
||||
$lang["sales_description_abbrv"] = "Desc";
|
||||
$lang["sales_discount"] = "Disc %";
|
||||
$lang["sales_discount_included"] = "% discount";
|
||||
$lang["sales_discount_included"] = "% Discount";
|
||||
$lang["sales_discount"] = "Discount";
|
||||
$lang["sales_discount_short"] = "%";
|
||||
$lang["sales_edit"] = "Edit";
|
||||
$lang["sales_edit_item"] = "Edit Item";
|
||||
|
||||
@@ -27,7 +27,8 @@ $lang["sales_delete_successful"] = "Has borrado satisfactoriamente una venta";
|
||||
$lang["sales_delete_unsuccessful"] = "No he podido borrar la venta satisfactoriamente";
|
||||
$lang["sales_description_abbrv"] = "Desc";
|
||||
$lang["sales_discount"] = "Desc %";
|
||||
$lang["sales_discount_included"] = "% discount";
|
||||
$lang["sales_discount_included"] = "% Discount";
|
||||
$lang["sales_discount"] = "Discount";
|
||||
$lang["sales_discount_short"] = "%";
|
||||
$lang["sales_edit"] = "Editar";
|
||||
$lang["sales_edit_item"] = "Editar Artículo";
|
||||
|
||||
@@ -27,7 +27,8 @@ $lang["sales_delete_successful"] = "Suppréssion réussie";
|
||||
$lang["sales_delete_unsuccessful"] = "Échec de suppression";
|
||||
$lang["sales_description_abbrv"] = "Desc";
|
||||
$lang["sales_discount"] = "% Remise";
|
||||
$lang["sales_discount_included"] = "% discount";
|
||||
$lang["sales_discount_included"] = "% Discount";
|
||||
$lang["sales_discount"] = "Discount";
|
||||
$lang["sales_discount_short"] = "%";
|
||||
$lang["sales_edit"] = "Éditer";
|
||||
$lang["sales_edit_item"] = "Éditer Item";
|
||||
|
||||
@@ -27,7 +27,8 @@ $lang["sales_delete_successful"] = "Transaksi Penjualan berhasil dihapus";
|
||||
$lang["sales_delete_unsuccessful"] = "Transaksi Penjualan tidak berhasil dihapus";
|
||||
$lang["sales_description_abbrv"] = "Deskripsi";
|
||||
$lang["sales_discount"] = "Diskon %";
|
||||
$lang["sales_discount_included"] = "% discount";
|
||||
$lang["sales_discount_included"] = "% Discount";
|
||||
$lang["sales_discount"] = "Discount";
|
||||
$lang["sales_discount_short"] = "%";
|
||||
$lang["sales_edit"] = "Ubah";
|
||||
$lang["sales_edit_item"] = "Ubah Item";
|
||||
|
||||
@@ -27,7 +27,8 @@ $lang["sales_delete_successful"] = "De geselecteerde aanko(o)p(en) werden verwij
|
||||
$lang["sales_delete_unsuccessful"] = "De geselecteerde aankopen konden niet worden verwijderd.";
|
||||
$lang["sales_description_abbrv"] = "Omschr.";
|
||||
$lang["sales_discount"] = "%";
|
||||
$lang["sales_discount_included"] = "% korting";
|
||||
$lang["sales_discount_included"] = "% Korting";
|
||||
$lang["sales_discount"] = "Korting";
|
||||
$lang["sales_discount_short"] = "%";
|
||||
$lang["sales_edit"] = "Bewerk";
|
||||
$lang["sales_edit_item"] = "Bewaar";
|
||||
|
||||
@@ -27,7 +27,8 @@ $lang["sales_delete_successful"] = "Вы успешно удален прода
|
||||
$lang["sales_delete_unsuccessful"] = "Вы безуспешно удален продаже";
|
||||
$lang["sales_description_abbrv"] = "описание";
|
||||
$lang["sales_discount"] = "скидка %";
|
||||
$lang["sales_discount_included"] = "% discount";
|
||||
$lang["sales_discount_included"] = "% Discount";
|
||||
$lang["sales_discount"] = "Discount";
|
||||
$lang["sales_discount_short"] = "%";
|
||||
$lang["sales_edit"] = "редактировать";
|
||||
$lang["sales_edit_item"] = "Редактировать Товар";
|
||||
|
||||
@@ -27,7 +27,8 @@ $lang["sales_delete_successful"] = "คุณลบการขายสำเ
|
||||
$lang["sales_delete_unsuccessful"] = "คุณลบการขายไม่สำเร็จ";
|
||||
$lang["sales_description_abbrv"] = "Desc";
|
||||
$lang["sales_discount"] = "ส่วนลด %";
|
||||
$lang["sales_discount_included"] = "% discount";
|
||||
$lang["sales_discount_included"] = "% Discount";
|
||||
$lang["sales_discount"] = "Discount";
|
||||
$lang["sales_discount_short"] = "";
|
||||
$lang["sales_edit"] = "แก้ไข";
|
||||
$lang["sales_edit_item"] = "แก้ไขสินค้า";
|
||||
|
||||
@@ -27,7 +27,8 @@ $lang["sales_delete_successful"] = "Satışı sildiniz";
|
||||
$lang["sales_delete_unsuccessful"] = "Satışı silemediniz";
|
||||
$lang["sales_description_abbrv"] = "Tanım";
|
||||
$lang["sales_discount"] = "İndirim %";
|
||||
$lang["sales_discount_included"] = "% discount";
|
||||
$lang["sales_discount_included"] = "% Discount";
|
||||
$lang["sales_discount"] = "Discount";
|
||||
$lang["sales_discount_short"] = "%";
|
||||
$lang["sales_edit"] = "Düzenle";
|
||||
$lang["sales_edit_item"] = "Düzenle";
|
||||
|
||||
@@ -27,7 +27,8 @@ $lang["sales_delete_successful"] = "您已成功刪除銷售資料";
|
||||
$lang["sales_delete_unsuccessful"] = "銷售資料刪除失敗";
|
||||
$lang["sales_description_abbrv"] = "倒序";
|
||||
$lang["sales_discount"] = "折扣 %";
|
||||
$lang["sales_discount_included"] = "% discount";
|
||||
$lang["sales_discount_included"] = "% Discount";
|
||||
$lang["sales_discount"] = "Discount";
|
||||
$lang["sales_discount_short"] = "%";
|
||||
$lang["sales_edit"] = "編輯";
|
||||
$lang["sales_edit_item"] = "編輯產品";
|
||||
|
||||
@@ -565,8 +565,7 @@ class Sale_lib
|
||||
{
|
||||
if ($item['discount'] > 0)
|
||||
{
|
||||
$name = $item['discount'];
|
||||
$discounts[$name] = $this->get_item_discount($item['quantity'], $item['price'], $item['discount']);
|
||||
$discounts[] = $this->get_item_discount($item['quantity'], $item['price'], $item['discount']);
|
||||
}
|
||||
}
|
||||
return $discounts;
|
||||
|
||||
@@ -91,7 +91,7 @@ if (isset($error_message))
|
||||
</tr>
|
||||
<?php foreach($discounts as $name=>$value) { ?>
|
||||
<tr>
|
||||
<td colspan="3" class="total-value"><?php echo $name . ' ' . $this->lang->line('sales_discount_included'); ?>:</td>
|
||||
<td colspan="3" class="total-value"><?php echo $this->lang->line('sales_discount'); ?>:</td>
|
||||
<td class="total-value"><?php echo to_currency($value*-1); ?></td>
|
||||
</tr>
|
||||
<?php }; ?>
|
||||
|
||||
@@ -26,7 +26,8 @@ sales_delete_successful,De geselecteerde aanko(o)p(en) werden verwijderd,Has bor
|
||||
sales_delete_unsuccessful,De geselecteerde aankopen konden niet worden verwijderd.,No he podido borrar la venta satisfactoriamente,You have unsuccessfully deleted a sale,Échec de suppression,銷售資料刪除失敗,Вы безуспешно удален продаже,คุณลบการขายไม่สำเร็จ,Satışı silemediniz,Transaksi Penjualan tidak berhasil dihapus
|
||||
sales_description_abbrv,Omschr.,Desc,Desc,Desc,倒序,описание,Desc,Tanım,Deskripsi
|
||||
sales_discount,%,Desc %,Disc %,% Remise,折扣 %,скидка %,ส่วนลด %,İndirim %,Diskon %
|
||||
sales_discount_included,% korting,% discount,% discount,% discount,% discount,% discount,% discount,% discount,% discount
|
||||
sales_discount_included,% Korting,% Discount,% Discount,% Discount,% Discount,% Discount,% Discount,% Discount,% Discount
|
||||
sales_discount,Korting,Discount,Discount,Discount,Discount,Discount,Discount,Discount,Discount
|
||||
sales_discount_short,%,%,%,%,%,%,,%,%
|
||||
sales_edit,Bewerk,Editar,Edit,Éditer,編輯,редактировать,แก้ไข,Düzenle,Ubah
|
||||
sales_edit_item,Bewaar,Editar Artículo,Edit Item,Éditer Item,編輯產品,Редактировать Товар,แก้ไขสินค้า,Düzenle,Ubah Item
|
||||
|
||||
|
Reference in New Issue
Block a user