From 93b08441213b71842ec6e7352cfe572132f42002 Mon Sep 17 00:00:00 2001 From: Joshua Fernandes Date: Mon, 24 Apr 2017 10:45:12 +0530 Subject: [PATCH] fixes for giftcard --- application/controllers/Sales.php | 8 ++++++-- application/language/ar-EG/giftcards_lang.php | 1 + application/language/de-CH/giftcards_lang.php | 1 + application/language/de/giftcards_lang.php | 1 + application/language/en/giftcards_lang.php | 1 + application/language/es/giftcards_lang.php | 1 + application/language/fr/giftcards_lang.php | 1 + application/language/hr-HR/giftcards_lang.php | 1 + application/language/hu-HU/giftcards_lang.php | 1 + application/language/id/giftcards_lang.php | 1 + application/language/nl-BE/giftcards_lang.php | 1 + application/language/pt-BR/giftcards_lang.php | 1 + application/language/ru/giftcards_lang.php | 1 + application/language/sv/giftcards_lang.php | 1 + application/language/th/giftcards_lang.php | 1 + application/language/tr/giftcards_lang.php | 1 + application/language/zh/giftcards_lang.php | 1 + application/models/Giftcard.php | 16 ++++++++++++++++ 18 files changed, 38 insertions(+), 2 deletions(-) diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php index c062b7998..380123ad8 100644 --- a/application/controllers/Sales.php +++ b/application/controllers/Sales.php @@ -227,8 +227,12 @@ class Sales extends Secure_Controller $payment_type = $payment_type . ':' . $giftcard_num; $current_payments_with_giftcard = isset($payments[$payment_type]) ? $payments[$payment_type]['payment_amount'] : 0; $cur_giftcard_value = $this->Giftcard->get_giftcard_value($giftcard_num); - - if(($cur_giftcard_value - $current_payments_with_giftcard) <= 0) + $cur_giftcard_customer = $this->Giftcard->get_giftcard_customer($giftcard_num); + $customer_id = $this->sale_lib->get_customer(); + if(isset($cur_giftcard_customer) && $cur_giftcard_customer != $customer_id){ + $data['error'] = $this->lang->line('giftcards_cannot_use', $giftcard_num); + } + elseif(($cur_giftcard_value - $current_payments_with_giftcard) <= 0) { $data['error'] = $this->lang->line('giftcards_remaining_balance', $giftcard_num, to_currency($cur_giftcard_value)); } diff --git a/application/language/ar-EG/giftcards_lang.php b/application/language/ar-EG/giftcards_lang.php index 9b1f0216e..c581b08a8 100644 --- a/application/language/ar-EG/giftcards_lang.php +++ b/application/language/ar-EG/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = "تحديث بطاقة هدية"; $lang["giftcards_use_inventory_menu"] = "استخدام تحديث المخزن"; $lang["giftcards_value"] = "قيمة بطاقة الهدية يجب ان تكون رقم"; $lang["giftcards_value_required"] = "قيمة بطاقة الهدية مطلوبة"; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/language/de-CH/giftcards_lang.php b/application/language/de-CH/giftcards_lang.php index 08bb2b23e..5bcaf7ee3 100644 --- a/application/language/de-CH/giftcards_lang.php +++ b/application/language/de-CH/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = "Gutschein ändern"; $lang["giftcards_use_inventory_menu"] = "Verwende Lager Menu"; $lang["giftcards_value"] = "Gutschein-Wert muss eine Zahl sein"; $lang["giftcards_value_required"] = "Gutschein-Wert erforderlich"; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/language/de/giftcards_lang.php b/application/language/de/giftcards_lang.php index 57882024c..655a08727 100644 --- a/application/language/de/giftcards_lang.php +++ b/application/language/de/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = "Gutschein ändern"; $lang["giftcards_use_inventory_menu"] = "Verwende Lager Menu"; $lang["giftcards_value"] = "Gutschein-Wert muss eine Zahl sein"; $lang["giftcards_value_required"] = "Gutschein-Wert erforderlich"; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/language/en/giftcards_lang.php b/application/language/en/giftcards_lang.php index 56e5afd5e..2494419cf 100644 --- a/application/language/en/giftcards_lang.php +++ b/application/language/en/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = "Update Giftcard"; $lang["giftcards_use_inventory_menu"] = "Use Inv. Menu"; $lang["giftcards_value"] = "Giftcard Value must be a number"; $lang["giftcards_value_required"] = "Giftcard Value is a required field"; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/language/es/giftcards_lang.php b/application/language/es/giftcards_lang.php index 393f9795c..58d6263b3 100644 --- a/application/language/es/giftcards_lang.php +++ b/application/language/es/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = "Actualizar Tarjeta de Regalo"; $lang["giftcards_use_inventory_menu"] = "Usar Menú de Inventario"; $lang["giftcards_value"] = "Valor de Tarjeta de Regalo debe ser un número"; $lang["giftcards_value_required"] = "Valor de Tarjeta de Regalo es requerido"; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/language/fr/giftcards_lang.php b/application/language/fr/giftcards_lang.php index a94b8affd..54085d9ba 100644 --- a/application/language/fr/giftcards_lang.php +++ b/application/language/fr/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = "Éditer Carte"; $lang["giftcards_use_inventory_menu"] = "Utiliser Menu Inv."; $lang["giftcards_value"] = "La valeur de la carte doit etre un nombre"; $lang["giftcards_value_required"] = "La Valeur est requise"; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/language/hr-HR/giftcards_lang.php b/application/language/hr-HR/giftcards_lang.php index 849c466d9..a26fce45f 100644 --- a/application/language/hr-HR/giftcards_lang.php +++ b/application/language/hr-HR/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = "Ažurirajte poklon bon"; $lang["giftcards_use_inventory_menu"] = "Koristite meni inventure"; $lang["giftcards_value"] = "Vrijednost poklon bona mora biti broj"; $lang["giftcards_value_required"] = "Vrijednost poklon kartice je potrebna"; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/language/hu-HU/giftcards_lang.php b/application/language/hu-HU/giftcards_lang.php index 50308d615..0a9681282 100644 --- a/application/language/hu-HU/giftcards_lang.php +++ b/application/language/hu-HU/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = "Utalvány módositás"; $lang["giftcards_use_inventory_menu"] = "Leltár menü haszn."; $lang["giftcards_value"] = "Utalvány értékének számnak kell lennie"; $lang["giftcards_value_required"] = "Utalvány érték kötelező mező"; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/language/id/giftcards_lang.php b/application/language/id/giftcards_lang.php index 5801e03ca..93e13332b 100644 --- a/application/language/id/giftcards_lang.php +++ b/application/language/id/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = "Ubah GiftCard"; $lang["giftcards_use_inventory_menu"] = "Gunakan Inv. Menu"; $lang["giftcards_value"] = "Nilai GiftCard harus angka"; $lang["giftcards_value_required"] = "Nilai GiftCard wajib diisi"; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/language/nl-BE/giftcards_lang.php b/application/language/nl-BE/giftcards_lang.php index 56b2f594b..caa38f497 100644 --- a/application/language/nl-BE/giftcards_lang.php +++ b/application/language/nl-BE/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = "Bewaar Cadeaubon"; $lang["giftcards_use_inventory_menu"] = "Gebruik inventaris menu"; $lang["giftcards_value"] = "Cadeaubon Waarde moet een getal zijn"; $lang["giftcards_value_required"] = "Cadeaubon Waarde is een verplicht veld"; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/language/pt-BR/giftcards_lang.php b/application/language/pt-BR/giftcards_lang.php index 06ec97a33..2188c3ea4 100644 --- a/application/language/pt-BR/giftcards_lang.php +++ b/application/language/pt-BR/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = "atualização cartão de presente"; $lang["giftcards_use_inventory_menu"] = "Usar menu de inventário"; $lang["giftcards_value"] = "Cartão de presente: O valor deve ser um número"; $lang["giftcards_value_required"] = "Cartão de presente: O valor é um campo obrigatório "; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/language/ru/giftcards_lang.php b/application/language/ru/giftcards_lang.php index ceb987186..845cda06c 100644 --- a/application/language/ru/giftcards_lang.php +++ b/application/language/ru/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = "Обновлять Подарочная карта" $lang["giftcards_use_inventory_menu"] = "Используйте меню инвентаря"; $lang["giftcards_value"] = "стоимость Подарочную карту должна быть цифрая"; $lang["giftcards_value_required"] = "стоимость Подарочную карту обязательный пробел"; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/language/sv/giftcards_lang.php b/application/language/sv/giftcards_lang.php index 7b57a24b5..35e852168 100644 --- a/application/language/sv/giftcards_lang.php +++ b/application/language/sv/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = ""; $lang["giftcards_use_inventory_menu"] = ""; $lang["giftcards_value"] = ""; $lang["giftcards_value_required"] = ""; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/language/th/giftcards_lang.php b/application/language/th/giftcards_lang.php index 6f3830680..3e1ad9b88 100644 --- a/application/language/th/giftcards_lang.php +++ b/application/language/th/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = "ปรับข้อมูลบัตรกำน $lang["giftcards_use_inventory_menu"] = ""; $lang["giftcards_value"] = "มูลค่าบัตรกำนัลต้องเป็นตัวเลขเท่านั้น"; $lang["giftcards_value_required"] = "ต้องกรอกมูลค่าบัตรกำนัล"; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/language/tr/giftcards_lang.php b/application/language/tr/giftcards_lang.php index f33006afb..d05203b4c 100644 --- a/application/language/tr/giftcards_lang.php +++ b/application/language/tr/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = "Hediye Çeki Güncelle"; $lang["giftcards_use_inventory_menu"] = "Stok Menüsünü Kullan"; $lang["giftcards_value"] = "Hediye Çeki Değeri rakam olmalıdır"; $lang["giftcards_value_required"] = "Hediye Çeki Değeri zorunlu bir alandır"; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/language/zh/giftcards_lang.php b/application/language/zh/giftcards_lang.php index 8a8a8213e..2a419dbdf 100755 --- a/application/language/zh/giftcards_lang.php +++ b/application/language/zh/giftcards_lang.php @@ -67,3 +67,4 @@ $lang["giftcards_update"] = "更新禮金券"; $lang["giftcards_use_inventory_menu"] = "使用庫存清單"; $lang["giftcards_value"] = "禮金券金額需為數字"; $lang["giftcards_value_required"] = "請輸入禮金券金額"; +$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!"; diff --git a/application/models/Giftcard.php b/application/models/Giftcard.php index 033cbe72f..c57a5319a 100644 --- a/application/models/Giftcard.php +++ b/application/models/Giftcard.php @@ -287,5 +287,21 @@ class Giftcard extends CI_Model return strtoupper($giftcard_name); } + + /* + Gets gift card customer + */ + public function get_giftcard_customer($giftcard_number) + { + if( !$this->exists($this->get_giftcard_id($giftcard_number)) ) + { + return 0; + } + + $this->db->from('giftcards'); + $this->db->where('giftcard_number', $giftcard_number); + + return $this->db->get()->row()->person_id; + } } ?>