From 972f0e81f4074c3e8d8d5668cd60576362b5e07c Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sat, 26 Mar 2016 10:55:07 +0000 Subject: [PATCH] change edit in sales/register and receiving to be a glyphicon with update label (#405 #116) --- .../language/de-CH/receivings_lang.php | 1 + application/language/de-CH/sales_lang.php | 2 +- application/language/en/receivings_lang.php | 1 + application/language/en/sales_lang.php | 4 ++-- application/language/es/receivings_lang.php | 1 + application/language/es/sales_lang.php | 2 +- application/language/fr/receivings_lang.php | 1 + application/language/fr/sales_lang.php | 2 +- application/language/id/receivings_lang.php | 1 + application/language/id/sales_lang.php | 2 +- .../language/nl-BE/receivings_lang.php | 1 + application/language/nl-BE/sales_lang.php | 2 +- application/language/ru/receivings_lang.php | 1 + application/language/ru/sales_lang.php | 2 +- application/language/th/receivings_lang.php | 1 + application/language/th/sales_lang.php | 2 +- application/language/tr/receivings_lang.php | 1 + application/language/tr/sales_lang.php | 2 +- application/language/zh/receivings_lang.php | 1 + application/language/zh/sales_lang.php | 2 +- application/views/receivings/receiving.php | 24 +++++++++++-------- application/views/sales/register.php | 19 ++++++++------- translations/receivings_lang.csv | 1 + translations/sales_lang.csv | 4 ++-- 24 files changed, 49 insertions(+), 31 deletions(-) diff --git a/application/language/de-CH/receivings_lang.php b/application/language/de-CH/receivings_lang.php index 1b903e704..088ae674e 100644 --- a/application/language/de-CH/receivings_lang.php +++ b/application/language/de-CH/receivings_lang.php @@ -48,3 +48,4 @@ $lang["recvs_supplier"] = "Lieferant"; $lang["recvs_total"] = "Total"; $lang["recvs_unable_to_add_item"] = "Kann Artikel nicht zum Eingang hinzufügen"; $lang["recvs_unsuccessfully_updated"] = "Eingang nicht erfolgreich geändert"; +$lang["recvs_update"] = "Ändern"; diff --git a/application/language/de-CH/sales_lang.php b/application/language/de-CH/sales_lang.php index d8f71a7d7..6c97f6085 100644 --- a/application/language/de-CH/sales_lang.php +++ b/application/language/de-CH/sales_lang.php @@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "Löschung nicht erfolgreich"; $lang["sales_unsuccessfully_updated"] = "Änderung nicht erfolgreich"; $lang["sales_unsuspend"] = "Aktivieren"; $lang["sales_unsuspend_and_delete"] = "Aktivieren und löschen"; -$lang["sales_update"] = "Ändere Auftrag"; +$lang["sales_update"] = "Ändern"; $lang["sales_date_range"] = "Zeitrahmen"; $lang["sales_none_selected"] = "Sie haben keinen Auftrag zum Löschen ausgewählt"; diff --git a/application/language/en/receivings_lang.php b/application/language/en/receivings_lang.php index b1bf00f7f..a6b8db90a 100644 --- a/application/language/en/receivings_lang.php +++ b/application/language/en/receivings_lang.php @@ -48,3 +48,4 @@ $lang["recvs_supplier"] = "Supplier"; $lang["recvs_total"] = "Total"; $lang["recvs_unable_to_add_item"] = "Unable to add item to receiving"; $lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated"; +$lang["recvs_update"] = "Update"; diff --git a/application/language/en/sales_lang.php b/application/language/en/sales_lang.php index 1d03355d2..dd9408ed9 100644 --- a/application/language/en/sales_lang.php +++ b/application/language/en/sales_lang.php @@ -32,7 +32,7 @@ $lang["sales_discount_included"] = "% Discount"; $lang["sales_discount"] = "Discount"; $lang["sales_discount_short"] = "%"; $lang["sales_edit"] = "Edit"; -$lang["sales_edit_item"] = "Update"; +$lang["sales_edit_item"] = "Edit Item"; $lang["sales_edit_sale"] = "Edit Sale"; $lang["sales_email_receipt"] = "Email Receipt"; $lang["sales_employee"] = "Employee"; @@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "Sale(s) could not be deleted"; $lang["sales_unsuccessfully_updated"] = "Sale unsuccessfully updated"; $lang["sales_unsuspend"] = "Unsuspend"; $lang["sales_unsuspend_and_delete"] = ""; -$lang["sales_update"] = "Edit Sale"; +$lang["sales_update"] = "Update"; $lang["sales_date_range"] = "Date Range"; $lang["sales_none_selected"] = "You have not selected any sales to delete"; diff --git a/application/language/es/receivings_lang.php b/application/language/es/receivings_lang.php index 4f2d97e70..0986bd027 100644 --- a/application/language/es/receivings_lang.php +++ b/application/language/es/receivings_lang.php @@ -48,3 +48,4 @@ $lang["recvs_supplier"] = "Proveedor"; $lang["recvs_total"] = "Total"; $lang["recvs_unable_to_add_item"] = "No se puede agregar el artículo a la entrada"; $lang["recvs_unsuccessfully_updated"] = "Recepción actualizada sin exito"; +$lang["recvs_update"] = "Editar"; diff --git a/application/language/es/sales_lang.php b/application/language/es/sales_lang.php index eb4455bb6..e1ee69a5d 100644 --- a/application/language/es/sales_lang.php +++ b/application/language/es/sales_lang.php @@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "Ha fallado la eliminación de la Venta" $lang["sales_unsuccessfully_updated"] = "Ha fallado la actualización de la venta"; $lang["sales_unsuspend"] = "Retomar"; $lang["sales_unsuspend_and_delete"] = "Retomar y Borrar"; -$lang["sales_update"] = "Editar Venta"; +$lang["sales_update"] = "Editar"; $lang["sales_date_range"] = "Rango de Fecha"; $lang["sales_none_selected"] = "No has seleccionado venta para editar"; diff --git a/application/language/fr/receivings_lang.php b/application/language/fr/receivings_lang.php index 16fd0fa97..c8c935dfb 100644 --- a/application/language/fr/receivings_lang.php +++ b/application/language/fr/receivings_lang.php @@ -48,3 +48,4 @@ $lang["recvs_supplier"] = "Fournisseur"; $lang["recvs_total"] = "Total"; $lang["recvs_unable_to_add_item"] = "Impossible d'ajouter l'item aux arrivages"; $lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated"; +$lang["recvs_update"] = "Éditer"; diff --git a/application/language/fr/sales_lang.php b/application/language/fr/sales_lang.php index ba23054d2..42c6c73c9 100644 --- a/application/language/fr/sales_lang.php +++ b/application/language/fr/sales_lang.php @@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "Échec de suppression"; $lang["sales_unsuccessfully_updated"] = "Échec d'édition"; $lang["sales_unsuspend"] = "Débloquer"; $lang["sales_unsuspend_and_delete"] = ""; -$lang["sales_update"] = "Edit Sale"; +$lang["sales_update"] = "Éditer"; $lang["sales_date_range"] = "Plage de dates"; $lang["sales_none_selected"] = "Vous n'avez sélectionné aucun élément"; diff --git a/application/language/id/receivings_lang.php b/application/language/id/receivings_lang.php index b2e7bc12d..c8b252125 100644 --- a/application/language/id/receivings_lang.php +++ b/application/language/id/receivings_lang.php @@ -48,3 +48,4 @@ $lang["recvs_supplier"] = "Pemasok"; $lang["recvs_total"] = "Total"; $lang["recvs_unable_to_add_item"] = "Item tidak dapat ditambahkan ke penerimaan barang masuk"; $lang["recvs_unsuccessfully_updated"] = "Tidak Berhasil Diperbaharui"; +$lang["recvs_update"] = "Ubah"; diff --git a/application/language/id/sales_lang.php b/application/language/id/sales_lang.php index fc5dcef09..88794ef2c 100644 --- a/application/language/id/sales_lang.php +++ b/application/language/id/sales_lang.php @@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "Transaksi Penjualan tidak berhasil diha $lang["sales_unsuccessfully_updated"] = "Penjualan tidak berhasil diperbarui"; $lang["sales_unsuspend"] = "Batal Penangguhan"; $lang["sales_unsuspend_and_delete"] = "Batalkan dan hapus penangguhan"; -$lang["sales_update"] = "Edit Sale"; +$lang["sales_update"] = "Ubah"; $lang["sales_date_range"] = "Rentang Tanggal"; $lang["sales_none_selected"] = "Anda belum memilih item untuk diubah"; diff --git a/application/language/nl-BE/receivings_lang.php b/application/language/nl-BE/receivings_lang.php index f2e630dc2..bcdae3c61 100755 --- a/application/language/nl-BE/receivings_lang.php +++ b/application/language/nl-BE/receivings_lang.php @@ -48,3 +48,4 @@ $lang["recvs_supplier"] = "Leverancier"; $lang["recvs_total"] = "Totaal"; $lang["recvs_unable_to_add_item"] = "Onmogelijk om product aan order toe te voegen"; $lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated"; +$lang["recvs_update"] = "Bewerk"; diff --git a/application/language/nl-BE/sales_lang.php b/application/language/nl-BE/sales_lang.php index 9f967decf..7aae80f57 100755 --- a/application/language/nl-BE/sales_lang.php +++ b/application/language/nl-BE/sales_lang.php @@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "De aankoop kon niet verwijderd worden"; $lang["sales_unsuccessfully_updated"] = "Fout bij het bewaren van ticket"; $lang["sales_unsuspend"] = "Hervat"; $lang["sales_unsuspend_and_delete"] = ""; -$lang["sales_update"] = "Bewerk Ticket"; +$lang["sales_update"] = "Bewerk"; $lang["sales_date_range"] = "Periode"; $lang["sales_none_selected"] = "U hebt geen aankopen geselecteerd"; diff --git a/application/language/ru/receivings_lang.php b/application/language/ru/receivings_lang.php index 4017c3ea1..48caef538 100644 --- a/application/language/ru/receivings_lang.php +++ b/application/language/ru/receivings_lang.php @@ -48,3 +48,4 @@ $lang["recvs_supplier"] = "поставщик"; $lang["recvs_total"] = "сумма"; $lang["recvs_unable_to_add_item"] = "Невозможно добавить товар на получение"; $lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated"; +$lang["recvs_update"] = "редактировать"; diff --git a/application/language/ru/sales_lang.php b/application/language/ru/sales_lang.php index 6dcb1a8f2..e7fd4d2f0 100644 --- a/application/language/ru/sales_lang.php +++ b/application/language/ru/sales_lang.php @@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "продажи безуспешно у $lang["sales_unsuccessfully_updated"] = "Продажа безуспешно обновлен"; $lang["sales_unsuspend"] = "Разблокировать"; $lang["sales_unsuspend_and_delete"] = "Разблокировать и удалить"; -$lang["sales_update"] = "Edit Sale"; +$lang["sales_update"] = "редактировать"; $lang["sales_date_range"] = "размах числа"; $lang["sales_none_selected"] = "Вы не выбрали ни одной товари для редактирования"; diff --git a/application/language/th/receivings_lang.php b/application/language/th/receivings_lang.php index 6ed803520..c047a51f3 100644 --- a/application/language/th/receivings_lang.php +++ b/application/language/th/receivings_lang.php @@ -48,3 +48,4 @@ $lang["recvs_supplier"] = "ผู้ผลิต"; $lang["recvs_total"] = "รวม"; $lang["recvs_unable_to_add_item"] = "ไม่สามารถเพิ่มสินค้าได้"; $lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated"; +$lang["recvs_update"] = "แก้ไข"; diff --git a/application/language/th/sales_lang.php b/application/language/th/sales_lang.php index b53192086..491c7dd77 100644 --- a/application/language/th/sales_lang.php +++ b/application/language/th/sales_lang.php @@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "ลบการขายไม่สำ $lang["sales_unsuccessfully_updated"] = "อัพเดทการขายไม่สมบูรณ์"; $lang["sales_unsuspend"] = "ยกเลิกการระงับ"; $lang["sales_unsuspend_and_delete"] = "ยกเลิกการระงับ และ ลบ"; -$lang["sales_update"] = "แก้ไขการขาย"; +$lang["sales_update"] = "แก้ไข"; $lang["sales_date_range"] = "ระหว่างวันที่"; $lang["sales_none_selected"] = "กรุณาเลือสินค้าที่ต้องการแก้ไข"; diff --git a/application/language/tr/receivings_lang.php b/application/language/tr/receivings_lang.php index 636d60af5..260dda724 100644 --- a/application/language/tr/receivings_lang.php +++ b/application/language/tr/receivings_lang.php @@ -48,3 +48,4 @@ $lang["recvs_supplier"] = "Sağlayıcı"; $lang["recvs_total"] = "Toplam"; $lang["recvs_unable_to_add_item"] = "Ürünler alıma eklenemedi"; $lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated"; +$lang["recvs_update"] = "Düzenle"; diff --git a/application/language/tr/sales_lang.php b/application/language/tr/sales_lang.php index 3d1a9f4b2..4c73ba28c 100644 --- a/application/language/tr/sales_lang.php +++ b/application/language/tr/sales_lang.php @@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "Satış silinemedi"; $lang["sales_unsuccessfully_updated"] = "Satış düzenlenemedi"; $lang["sales_unsuspend"] = "Satışa Al"; $lang["sales_unsuspend_and_delete"] = ""; -$lang["sales_update"] = "Edit Sale"; +$lang["sales_update"] = "Düzenle"; $lang["sales_date_range"] = "Tarih Aralığı"; $lang["sales_none_selected"] = "Düzenlemek için ürün seçmediniz"; diff --git a/application/language/zh/receivings_lang.php b/application/language/zh/receivings_lang.php index 22e3b8991..230394fdb 100755 --- a/application/language/zh/receivings_lang.php +++ b/application/language/zh/receivings_lang.php @@ -48,3 +48,4 @@ $lang["recvs_supplier"] = "供應商"; $lang["recvs_total"] = "總數量"; $lang["recvs_unable_to_add_item"] = "無法新增進貨資料"; $lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated"; +$lang["recvs_update"] = "編輯"; diff --git a/application/language/zh/sales_lang.php b/application/language/zh/sales_lang.php index 3e510add1..19947db9c 100755 --- a/application/language/zh/sales_lang.php +++ b/application/language/zh/sales_lang.php @@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "銷售資料刪除失敗"; $lang["sales_unsuccessfully_updated"] = "銷售資料更新失敗"; $lang["sales_unsuspend"] = "取消暫停銷售"; $lang["sales_unsuspend_and_delete"] = "取消暫停銷售並刪除"; -$lang["sales_update"] = "Edit Sale"; +$lang["sales_update"] = "編輯"; $lang["sales_date_range"] = "日期範圍"; $lang["sales_none_selected"] = "您還沒有選擇任何產品進行編輯"; diff --git a/application/views/receivings/receiving.php b/application/views/receivings/receiving.php index b9ea9ea22..e9c7bc5db 100644 --- a/application/views/receivings/receiving.php +++ b/application/views/receivings/receiving.php @@ -89,14 +89,14 @@ if (isset($error)) - - + + - + @@ -117,11 +117,13 @@ if (isset($error)) foreach(array_reverse($cart, true) as $line=>$item) { ?> - 'form-horizontal')); ?> + 'form-horizontal', 'id'=>'cart_'.$line)); ?> - + - - + @@ -144,7 +148,7 @@ if (isset($error)) if ($item['receiving_quantity'] > 1) { ?> - + - + - + - + - + @@ -123,11 +123,12 @@ if (isset($success)) $tabindex = 5; } ?> - 'form-horizontal')); ?> + 'form-horizontal', 'id'=>'cart_'.$line)); ?> - @@ -141,8 +142,10 @@ if (isset($success)) else { ?> - - + @@ -163,7 +166,7 @@ if (isset($success)) - +
lang->line('common_delete'); ?>lang->line('recvs_item_name'); ?>lang->line('common_delete'); ?>lang->line('recvs_item_name'); ?> lang->line('recvs_cost'); ?> lang->line('recvs_quantity'); ?> lang->line('recvs_discount'); ?> lang->line('recvs_total'); ?>lang->line('recvs_edit'); ?>lang->line('recvs_update'); ?>
');?>
[ in ] -
+
[ in ] + +
+ + + x 'edit_item', 'value'=>$this->lang->line('sales_edit_item'), 'class'=>'btn btn-default btn-xs'));?>lang->line('recvs_update')?> >
lang->line('common_delete'); ?>lang->line('common_delete'); ?> lang->line('sales_item_number'); ?>lang->line('sales_item_name'); ?>lang->line('sales_item_name'); ?> lang->line('sales_price'); ?> lang->line('sales_quantity'); ?> lang->line('sales_discount'); ?> lang->line('sales_total'); ?>lang->line('sales_edit'); ?>lang->line('sales_update'); ?>
');?>
[ in ] +
+
[ in ]
+ + + 'discount', 'class'=>'form-control input-sm', 'value'=>$item['discount']));?> 'edit_item', 'value'=>$this->lang->line('sales_edit_item'), 'class'=>'btn btn-default btn-xs'));?>lang->line('sales_update')?> >