Remove gift certificate stuff

agentphoenix · Feb 20, 2014 · 2f537f8 · 2f537f8
1 parent 72813ac
commit 2f537f8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/Scheduler/Services/BookingService.php b/Scheduler/Services/BookingService.php
@@ -56,10 +56,8 @@ public function lesson(array $data)
 
 		// Set the initial user appointment record
 		$userApptRecord = array(
-			'user_id'		=> $user->id,
-			'has_gift'		=> (int) $data['has_gift'],
-			'gift_amount'	=> ($data['has_gift'] == 1) ? (int) $data['gift_amount'] : 0,
-			'amount'		=> ($data['has_gift'] == 1) ? ($service->price - $data['gift_amount']) : $service->price,
+			'user_id'	=> $user->id,
+			'amount'	=> $service->price,
 		);
 
 		// Automatically mark free services as paid
@@ -111,7 +109,8 @@ public function lesson(array $data)
 					'appointment_id'	=> $sa->id,
 					'user_id'			=> $data['user'],
 					'recur_id'			=> $recurItem->id,
-					'amount'			=> $service->price,
+					'amount'			=> ($user->isStaff()) ? 0 : $service->price,
+					'paid'				=> ($user->isStaff() or $service->price == 0) ? (int) true : (int) false,
 				));
 			}
 		}
@@ -139,10 +138,8 @@ public function program(array $data)
 
 		// Set the initial user appointment record
 		$userApptRecord = array(
-			'user_id'		=> $user->id,
-			'has_gift'		=> (int) $data['has_gift'],
-			'gift_amount'	=> ($data['has_gift'] == 1) ? (int) $data['gift_amount'] : 0,
-			'amount'		=> ($data['has_gift'] == 1) ? ($service->price - $data['gift_amount']) : $service->price,
+			'user_id'	=> $user->id,
+			'amount'	=> $service->price,
 		);
 
 		// Automatically mark free services as paid

diff --git a/Scheduler/views/pages/booking/lesson.blade.php b/Scheduler/views/pages/booking/lesson.blade.php
@@ -90,7 +90,7 @@
 				{{ Form::hidden('user', $_currentUser->id) }}
 			@endif
 
-			<div class="row">
+			<!--<div class="row">
 				<div class="col-lg-4">
 					<div class="form-group">
 						<label class="control-label">Do you have a gift certificate?</label>
@@ -116,7 +116,7 @@
 						</div>
 					</div>
 				</div>
-			</div>
+			</div>-->
 
 			<div class="row">
 				<div class="col-lg-12">

diff --git a/Scheduler/views/pages/booking/program.blade.php b/Scheduler/views/pages/booking/program.blade.php
@@ -37,7 +37,7 @@
 			{{ Form::hidden('user', $_currentUser->id) }}
 		@endif
 
-		<div class="row">
+		<!--<div class="row">
 			<div class="col-lg-4">
 				<div class="form-group">
 					<label class="control-label">Do you have a gift certificate?</label>
@@ -63,7 +63,7 @@
 					</div>
 				</div>
 			</div>
-		</div>
+		</div>-->
 
 		<div class="row" id="enrollBtn">
 			<div class="col-lg-12">