Subversion Repositories SmartDukaan

Rev

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

Rev 14880 Rev 14887
Line 33... Line 33...
33
			<div class="col-xs-7 cashback">Cashback : <span class="rupee"></span><span class="product_price"><?php echo $suborder['cashBackAmount'];?></span>
33
			<div class="col-xs-7 cashback">Cashback : <span class="rupee"></span><span class="product_price"><?php echo $suborder['cashBackAmount'];?></span>
34
			</div>								
34
			</div>								
35
			<div class="col-xs-5">(<?php echo $suborder['cashBackStatus'];?>)</div>
35
			<div class="col-xs-5">(<?php echo $suborder['cashBackStatus'];?>)</div>
36
		</div>
36
		</div>
37
		<?php endif;?>	
37
		<?php endif;?>	
38
		<?php if($suborder['detailedStatus']!='Cancelled' && $suborder['detailedStatus']!='Delivered'):?>			
38
		<?php if($suborder['status']=='Order Placed'):?>			
39
			<?php if(!empty($suborder['estimatedDeliveryDate'])):?>
39
			<?php if(!empty($suborder['estimatedDeliveryDate'])):?>
40
			<div class="row orderdetails">
40
			<div class="row orderdetails">
41
				<div class="col-xs-7">Delivery by</div>
41
				<div class="col-xs-7">Delivery by</div>
42
				<div class="col-xs-5"><?php echo formatOrderDate($suborder['estimatedDeliveryDate'],$suborder['storeId'],'edd');?></div>
42
				<div class="col-xs-5"><?php echo formatOrderDate($suborder['estimatedDeliveryDate'],$suborder['storeId'],'edd');?></div>
43
			</div>			
43
			</div>			
Line 45... Line 45...
45
			<div class="row orderdetails">
45
			<div class="row orderdetails">
46
				<div class="col-xs-7">Shipping by</div>
46
				<div class="col-xs-7">Shipping by</div>
47
				<div class="col-xs-5"><?php echo formatOrderDate($suborder['estimatedShippingDate'],$suborder['storeId'],'edd');?></div>
47
				<div class="col-xs-5"><?php echo formatOrderDate($suborder['estimatedShippingDate'],$suborder['storeId'],'edd');?></div>
48
			</div>	
48
			</div>	
49
			<?php endif;?>
49
			<?php endif;?>
-
 
50
		<?php elseif($suborder['status']=='Shipped'):?>
-
 
51
			<?php if(!empty($suborder['estimatedDeliveryDate'])):?>
-
 
52
			<div class="row orderdetails">
-
 
53
				<div class="col-xs-7">Delivery by</div>
-
 
54
				<div class="col-xs-5"><?php echo formatOrderDate($suborder['estimatedDeliveryDate'],$suborder['storeId'],'edd');?></div>
-
 
55
			</div>			
50
		<?php endif;?>
56
		<?php endif;?>
51
		<div class="row">
57
		<div class="row">
52
			<div class="col-xs-12 ordercontrols">
58
			<div class="col-xs-12 ordercontrols">
53
				<?php if(!empty($suborder['detailedStatus'])):?>
59
				<?php if(!empty($suborder['detailedStatus'])):?>
54
				<span class="label label-info <?php if(strlen($suborder['detailedStatus'])>50):?>hasmoretext<?php endif;?>" data-fulltext="<?php echo $suborder['detailedStatus'];?>"><?php echo $this->Text->truncate($suborder['detailedStatus'],50);?></span>
60
				<span class="label label-info <?php if(strlen($suborder['detailedStatus'])>50):?>hasmoretext<?php endif;?>" data-fulltext="<?php echo $suborder['detailedStatus'];?>"><?php echo $this->Text->truncate($suborder['detailedStatus'],50);?></span>