From 3a6b5be7d9bca386db37fb975448f4d96d0e20ad Mon Sep 17 00:00:00 2001
From: Mark <mark@nirph.com>
Date: Tue, 28 Feb 2017 14:27:53 +0200
Subject: [PATCH] issue with offline sending through gearmanClient

---
 .../Auction/src/Auction/Service/Auction.php   |  15 +++
 .../src/Utility/Comms/Notification.php        | 103 ++++++++++--------
 2 files changed, 71 insertions(+), 47 deletions(-)

diff --git a/module/Auction/src/Auction/Service/Auction.php b/module/Auction/src/Auction/Service/Auction.php
index 22da77e..b2aca46 100644
--- a/module/Auction/src/Auction/Service/Auction.php
+++ b/module/Auction/src/Auction/Service/Auction.php
@@ -560,9 +560,15 @@ class Auction extends \Auction\DataBin\Auction
 			$this->workflowNode->setJob($item);
 			try
 			{
+				\Utility\Debug::errorLog('currentbid',$item->currentBid->amount);
+				\Utility\Debug::errorLog('reserve',$item->reservePrice);
+
 				if (!is_null($item->currentBid) && $item->currentBid->amount > $item->reservePrice)
 				{
 					#-> We have a winner.
+					\Utility\Debug::errorLog('Winner',$item->id);
+
+
 					$item->soldToCompany = $item->currentBid->company;
 					$item->soldToProfile = $item->currentBid->profile;
 					$this->workflowNode->changeState('This.Sold');
@@ -570,6 +576,7 @@ class Auction extends \Auction\DataBin\Auction
 				else
 				{
 					#-> Each and every one a loser.
+					\Utility\Debug::errorLog('no winner',$item->id);
 					$this->workflowNode->changeState('This.Relist');
 				}
 			}
@@ -591,6 +598,7 @@ class Auction extends \Auction\DataBin\Auction
 		{
 			try
 			{
+				\Utility\Debug::errorLog('setting data for mail',$item->id);
 
 				#-> General data prep.
 				$vehicle    = $item->stock->type->model->make->name
@@ -599,8 +607,15 @@ class Auction extends \Auction\DataBin\Auction
 				$currPrefix = \Utility\Definitions\Locale::getCurrencyPrefix() . ' ';
 				$oNotify    = new \Utility\Comms\Notification();
 
+				\Utility\Debug::errorLog('jobstate',$item->jobState);
+				\Utility\Debug::errorLog('currentbid',$item->currentBid->amount);
+				\Utility\Debug::errorLog('reserve',$item->reservePrice);
+
 				if (!is_null($item->currentBid) && $item->currentBid->amount > $item->reservePrice && 'Sold' == $item->jobState)
 				{
+					\Utility\Debug::errorLog('sending mails',$item->jobState);
+
+
 					#-> Update record to reflect winner.
 					$item->soldToCompany = $item->currentBid->company;
 					$item->soldToProfile = $item->currentBid->profile;
diff --git a/module/Utility/src/Utility/Comms/Notification.php b/module/Utility/src/Utility/Comms/Notification.php
index 1b36c36..93be2c1 100644
--- a/module/Utility/src/Utility/Comms/Notification.php
+++ b/module/Utility/src/Utility/Comms/Notification.php
@@ -404,58 +404,67 @@ class Notification
 		$disableSms = false
 	)
 	{
-		if (IS_BROCHURE)
-		{
-			self::send(
+		//problem with GearmanClient so i'm just using normal send for now
+		self::send(
 				$fromCompanyId, $fromProfileId,
 				$toCompanyId, $toProfileId, $email, $mobile,
 				$subject, $emailTemplate, $smsTemplate,
 				$attachments, $complexAttachments, $disableSms
 			);
-		}
-		else
-		{
-			$id = 'n' . microtime(true);
-			while (\Utility\FileStore::existsJson($id))
-			{
-				time_nanosleep(0, 1000);
-				$id = 'n' . microtime(true);
-			};
-			foreach ($attachments as $key => $data)
-			{
-				$attachments[$key] = utf8_encode($data);
-			}
-			foreach ($complexAttachments as $key => $data)
-			{
-				$complexAttachments[$key] = utf8_encode($data);
-			}
-			\Utility\FileStore::storeJson(
-				$id,
-				array(
-					'fromCompanyId'      => $fromCompanyId,
-					'fromProfileId'      => $fromProfileId,
-					'toCompanyId'        => $toCompanyId,
-					'toProfileId'        => $toProfileId,
-					'email'              => $email,
-					'mobile'             => $mobile,
-					'subject'            => $subject,
-					'emailTemplate'      => $emailTemplate,
-					'smsTemplate'        => $smsTemplate,
-					'attachments'        => $attachments,
-					'complexAttachments' => $complexAttachments,
-					'disableSms'         => $disableSms
-				)
-			);
-			if (false === self::$_gearClient)
-			{
-				self::$_gearClient = new \GearmanClient();
-				self::$_gearClient->addServer();
-			}
-			self::$_gearClient->doBackground(
-				'Notify',
-				$id
-			);
-		}
+
+//		if (IS_BROCHURE)
+//		{
+//			self::send(
+//				$fromCompanyId, $fromProfileId,
+//				$toCompanyId, $toProfileId, $email, $mobile,
+//				$subject, $emailTemplate, $smsTemplate,
+//				$attachments, $complexAttachments, $disableSms
+//			);
+//		}
+//		else
+//		{
+//			$id = 'n' . microtime(true);
+//			while (\Utility\FileStore::existsJson($id))
+//			{
+//				time_nanosleep(0, 1000);
+//				$id = 'n' . microtime(true);
+//			};
+//			foreach ($attachments as $key => $data)
+//			{
+//				$attachments[$key] = utf8_encode($data);
+//			}
+//			foreach ($complexAttachments as $key => $data)
+//			{
+//				$complexAttachments[$key] = utf8_encode($data);
+//			}
+//			\Utility\FileStore::storeJson(
+//				$id,
+//				array(
+//					'fromCompanyId'      => $fromCompanyId,
+//					'fromProfileId'      => $fromProfileId,
+//					'toCompanyId'        => $toCompanyId,
+//					'toProfileId'        => $toProfileId,
+//					'email'              => $email,
+//					'mobile'             => $mobile,
+//					'subject'            => $subject,
+//					'emailTemplate'      => $emailTemplate,
+//					'smsTemplate'        => $smsTemplate,
+//					'attachments'        => $attachments,
+//					'complexAttachments' => $complexAttachments,
+//					'disableSms'         => $disableSms
+//				)
+//			);
+//			if (false === self::$_gearClient)
+//			{
+//				self::$_gearClient = new GearmanClient();
+//				self::$_gearClient->addServer();
+//			}
+//			$job_handle=self::$_gearClient->doBackground(
+//				'Notify',
+//				$id
+//			);
+//
+//		}
 	}
 
 
-- 
2.20.1