Subversion Repositories SmartDukaan

Rev

Rev 15035 | Rev 15037 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 15035 Rev 15036
Line 7... Line 7...
7 
			<?php if(!empty($order['subOrders'])):?>
 7 
			<?php if(!empty($order['subOrders'])):?>
8 
				<?php foreach ($order['subOrders'] as $key => $suborder):?>
8 
				<?php foreach ($order['subOrders'] as $key => $suborder):?>
9 
				<?php $suborder['storeId'] = $order['storeId'];?>
9 
				<?php $suborder['storeId'] = $order['storeId'];?>
10 
				<?php if(!empty($order['merchantOderId'])):?>
 10 
				<?php if(!empty($order['merchantOderId'])):?>
11 
				<?php $suborder['merchantOrderId'] = $order['merchantOderId'];?>
 11 
				<?php $suborder['merchantOrderId'] = $order['merchantOderId'];?>
12 
				<?php endif;?>
 12 
				<?php else:?>
13 
				<?php if($order['storeId'] != 4):?>
 - 
 
14 
				<?php $suborder['merchantOrderId'] = $order['merchantOrderId'];?>
 13 
				<?php $suborder['merchantOrderId'] = $subOrder['merchantSubOderId'];?>
15 
				<?php endif;?>
 14 
				<?php endif;?>
16 
				<?php
15 
				<?php
17 
					if(!empty($order['orderTrackingUrl'])){
 16 
					if(!empty($order['orderTrackingUrl'])){
18 
						$suborder['orderSuccessUrl'] = $order['orderTrackingUrl'];
 17 
						$suborder['orderSuccessUrl'] = $order['orderTrackingUrl'];
19 
					}
 18 
					}
Line 48... Line 47...
48 
			$dateParts = explode(' ', $date);
 47 
			$dateParts = explode(' ', $date);
49 
			$formatteddate = substr($dateParts[1],0,3).' '.$dateParts[0].', '.$dateParts[3].' '.$dateParts[4];
 48 
			$formatteddate = substr($dateParts[1],0,3).' '.$dateParts[0].', '.$dateParts[3].' '.$dateParts[4];
50 
			break;
 49 
			break;
51 
			case 3:
 50 
			case 3:
52 
			$dateParts = explode(' ', $date);
 51 
			$dateParts = explode(' ', $date);
53 
			if(count($dateParts)>4){
 - 
 
54 
				$formatteddate = $dateParts[0].' '.substr($dateParts[1],0,2).', '.$dateParts[3].' '.$dateParts[4];
 52 
			$formatteddate = $dateParts[0].' '.substr($dateParts[1],0,2).', '.$dateParts[3].' '.$dateParts[4];
55 
			}else{
 - 
 
56 
				$formatteddate = substr($dateParts[2],0,-1).' '.$dateParts[1];
 - 
 
57 
			}
 - 
 
58 
			break;
 53 
			break;
59 
			default:
 54 
			default:
60 
			case 1:
 55 
			case 1:
61 
			$formatteddate = date('M d',strtotime($date));
 56 
			$formatteddate = date('M d',strtotime($date));
62 
			break;
 57 
			break;