Subversion Repositories SmartDukaan

Rev

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

Rev 26031 Rev 26110
Line 92... Line 92...
92 
	    				#if(!$pendingPaymentorder.isEmpty())
 92 
	    				#if(!$pendingPaymentorder.isEmpty())
93 
		    					 #foreach($pendingorderDetail in $pendingPaymentorder )
 93 
		    					 #foreach($pendingorderDetail in $pendingPaymentorder )
94 
		    					 #if(!($pendingorderDetail.getRefundTimestamp()) && $pendingorderDetail.getWalletAmount()>0)
 94 
		    					 #if(!($pendingorderDetail.getRefundTimestamp()) && $pendingorderDetail.getWalletAmount()>0)
95 
		    					 	<tr>
 95 
		    					 	<tr>
96
96
97 
	    							     <td>$pendingorderDetail.getLineItem().getItemId()</td>
 97 
	    							    <td>$pendingorderDetail.getLineItem().getItemId()</td>
98 
		    					       	<td>$pendingorderDetail.getId()</td>
 98 
		    					       	<td>$pendingorderDetail.getId()</td>
99 
		    					 		<td>$pendingorderDetail.getLineItem().getItem().getItemDescription()</td>
 99 
		    					 		<td>$pendingorderDetail.getLineItem().getItem().getItemDescription()</td>
100 
		    					 		<td>$pendingorderDetail.getTransactionId()</td>
 100 
		    					 		<td>$pendingorderDetail.getTransactionId()</td>
101 
		    					 		<td>$pendingorderDetail.getRetailerName()</td>
 101 
		    					 		<td>$pendingorderDetail.getRetailerName()</td>
102 
                                        <td>$pendingorderDetail.getRetailerMobileNumber()</td>
102 
                                        <td>$pendingorderDetail.getRetailerMobileNumber()</td>
Line 128... Line 128...
128
128
129 
								<th>Item Id</th>
 129 
								<th>Item Id</th>
130 
	    						<th>OrderId</th>
 130 
	    						<th>OrderId</th>
131 
	    						<th>Description</th>
 131 
	    						<th>Description</th>
132 
	    						<th>Notify Status</th>
 132 
	    						<th>Notify Status</th>
- 
 
 133 
	    						<th>Notify Cancel Status</th>
133 
	    						<th>Transactino Id</th>
 134 
	    						<th>Transactino Id</th>
134 
	    						<th>Customer Name </th>
 135 
	    						<th>Customer Name </th>
135 
	    						<th>Mobile</th>
 136 
	    						<th>Mobile</th>
136 
	    						<th>Qty</th>
 137 
	    						<th>Qty</th>
137 
	    						<th>City</th>
 138 
	    						<th>City</th>
Line 157... Line 158...
157 
		    					 		#if($latestNotifyOrders.get($orderDetail.getId()))
 158 
		    					 		#if($latestNotifyOrders.get($orderDetail.getId()))
158 
			    					    <td> <button type="button" class="btn btn-link mk_button">$latestNotifyOrders.get($orderDetail.getId()).get().getStatus()</button></td>
 159 
			    					    <td> <button type="button" class="btn btn-link mk_button">$latestNotifyOrders.get($orderDetail.getId()).get().getStatus()</button></td>
159 
			    					    #else
 160 
			    					    #else
160 
			    					    <td> </td>
 161 
			    					    <td> </td>
161 
			    					    #end
 162 
			    					    #end
- 
 
 163 
			    					    #if($notifyCancelOrders.get($orderDetail.getId()))
- 
 
 164 
			    					    <td> <button type="button" class="btn btn-link mk_button">notified</button></td>
- 
 
 165 
			    					    #else
- 
 
 166 
			    					    <td> </td>
- 
 
 167 
			    					    #end
- 
 
 168
162 
			    					    <td>$orderDetail.getTransactionId()</td>
 169 
			    					    <td>$orderDetail.getTransactionId()</td>
163 
		    					 		<td>$orderDetail.getRetailerName()</td>
 170 
		    					 		<td>$orderDetail.getRetailerName()</td>
164 
                                        <td>$orderDetail.getRetailerMobileNumber()</td>
 171 
                                        <td>$orderDetail.getRetailerMobileNumber()</td>
165 
                                        <td>$orderDetail.getLineItem().getQuantity()</td>
172 
                                        <td>$orderDetail.getLineItem().getQuantity()</td>
166 
                                        <td>$orderDetail.getRetailerCity()</td>
 173 
                                        <td>$orderDetail.getRetailerCity()</td>