diff --git a/application/language/en/sales_lang.php b/application/language/en/sales_lang.php index 21f013b89..02f7002f2 100644 --- a/application/language/en/sales_lang.php +++ b/application/language/en/sales_lang.php @@ -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"; diff --git a/application/language/es/sales_lang.php b/application/language/es/sales_lang.php index d5463e2ad..9f65354d8 100644 --- a/application/language/es/sales_lang.php +++ b/application/language/es/sales_lang.php @@ -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"; diff --git a/application/language/fr/sales_lang.php b/application/language/fr/sales_lang.php index 4eea5f2e6..6d0e0b5c4 100644 --- a/application/language/fr/sales_lang.php +++ b/application/language/fr/sales_lang.php @@ -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"; diff --git a/application/language/id/sales_lang.php b/application/language/id/sales_lang.php index d23c3084a..533696a7d 100644 --- a/application/language/id/sales_lang.php +++ b/application/language/id/sales_lang.php @@ -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"; diff --git a/application/language/nl-BE/sales_lang.php b/application/language/nl-BE/sales_lang.php index 8aa7377c1..7ea694bfb 100755 --- a/application/language/nl-BE/sales_lang.php +++ b/application/language/nl-BE/sales_lang.php @@ -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"; diff --git a/application/language/ru/sales_lang.php b/application/language/ru/sales_lang.php index 070a6bf10..6e71b876d 100644 --- a/application/language/ru/sales_lang.php +++ b/application/language/ru/sales_lang.php @@ -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"] = "Редактировать Товар"; diff --git a/application/language/th/sales_lang.php b/application/language/th/sales_lang.php index 8660e4eb1..0220efe6c 100644 --- a/application/language/th/sales_lang.php +++ b/application/language/th/sales_lang.php @@ -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"] = "แก้ไขสินค้า"; diff --git a/application/language/tr/sales_lang.php b/application/language/tr/sales_lang.php index 37cae9880..a8544c2df 100644 --- a/application/language/tr/sales_lang.php +++ b/application/language/tr/sales_lang.php @@ -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"; diff --git a/application/language/zh/sales_lang.php b/application/language/zh/sales_lang.php index 74e641d91..01e0e658d 100755 --- a/application/language/zh/sales_lang.php +++ b/application/language/zh/sales_lang.php @@ -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"] = "編輯產品"; diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php index df905d5f4..cabdc4834 100644 --- a/application/libraries/Sale_lib.php +++ b/application/libraries/Sale_lib.php @@ -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; diff --git a/application/views/sales/receipt.php b/application/views/sales/receipt.php index 1baf37d42..aa6e9cc5c 100644 --- a/application/views/sales/receipt.php +++ b/application/views/sales/receipt.php @@ -91,7 +91,7 @@ if (isset($error_message)) $value) { ?> - lang->line('sales_discount_included'); ?>: + lang->line('sales_discount'); ?>: diff --git a/translations/sales_lang.csv b/translations/sales_lang.csv index 275474d38..5e9b058b4 100644 --- a/translations/sales_lang.csv +++ b/translations/sales_lang.csv @@ -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