fixes for giftcard

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));
 				}

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!";

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!";

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!";

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!";

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!";

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!";

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!";

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!";

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!";

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!";

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!";

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!";

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!";

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!";

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!";

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!";

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;
+	}
 }
 ?>