Subversion Repositories SmartDukaan

Rev

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

Rev 25640 Rev 25789
Line 75... Line 75...
75
		    			<thead>
75
		    			<thead>
76
				            <tr>
76
				            <tr>
77
								<th>Item Id</th>
77
								<th>Item Id</th>
78
	    						<th>OrderId</th>
78
	    						<th>OrderId</th>
79
	    						<th>Description</th>
79
	    						<th>Description</th>
-
 
80
	    						<th>Transaction Id</th>
80
	    						<th>Customer Name </th>
81
	    						<th>Customer Name </th>
81
	    						<th>Mobile</th>
82
	    						<th>Mobile</th>
82
	    						<th>Amount</th>
83
	    						<th>Amount</th>
83
	    						<th>Quantity</th>
84
	    						<th>Quantity</th>
84
	    						<th>Created Timestamp</th>
85
	    						<th>Created Timestamp</th>
Line 94... Line 95...
94
		    					 	<tr>
95
		    					 	<tr>
95
		    					 		
96
		    					 		
96
	    							     <td>$pendingorderDetail.getLineItem().getItemId()</td>
97
	    							     <td>$pendingorderDetail.getLineItem().getItemId()</td>
97
		    					       	<td>$pendingorderDetail.getId()</td>
98
		    					       	<td>$pendingorderDetail.getId()</td>
98
		    					 		<td>$pendingorderDetail.getLineItem().getItem().getItemDescription()</td>
99
		    					 		<td>$pendingorderDetail.getLineItem().getItem().getItemDescription()</td>
-
 
100
		    					 		<td>$pendingorderDetail.getTransactionId()</td>
99
		    					 		<td>$pendingorderDetail.getRetailerName()</td>
101
		    					 		<td>$pendingorderDetail.getRetailerName()</td>
100
                                        <td>$pendingorderDetail.getRetailerMobileNumber()</td>		
102
                                        <td>$pendingorderDetail.getRetailerMobileNumber()</td>		
101
                                        <td>$pendingorderDetail.getTotalAmount()</td>
103
                                        <td>$pendingorderDetail.getTotalAmount()</td>
102
                                        <td>$pendingorderDetail.getLineItem().getQuantity()</td>	
104
                                        <td>$pendingorderDetail.getLineItem().getQuantity()</td>	
103
                                        <td>$pendingorderDetail.getCreateTimestamp().format($dateTimeFormatter)</td>
105
                                        <td>$pendingorderDetail.getCreateTimestamp().format($dateTimeFormatter)</td>
Line 126... Line 128...
126
				               
128
				               
127
								<th>Item Id</th>
129
								<th>Item Id</th>
128
	    						<th>OrderId</th>
130
	    						<th>OrderId</th>
129
	    						<th>Description</th>
131
	    						<th>Description</th>
130
	    						<th>Notify Status</th>
132
	    						<th>Notify Status</th>
-
 
133
	    						<th>Transactino Id</th>
131
	    						<th>Customer Name </th>
134
	    						<th>Customer Name </th>
132
	    						<th>Mobile</th>
135
	    						<th>Mobile</th>
133
	    						<th>Qty</th>
136
	    						<th>Qty</th>
134
	    						<th>City</th>
137
	    						<th>City</th>
135
	    						<th>State</th>
138
	    						<th>State</th>
Line 153... Line 156...
153
		    					 		#if($latestNotifyOrders.get($orderDetail.getId()))
156
		    					 		#if($latestNotifyOrders.get($orderDetail.getId()))
154
			    					    <td> <button type="button" class="btn btn-link mk_button">$latestNotifyOrders.get($orderDetail.getId()).get().getStatus()</button></td>
157
			    					    <td> <button type="button" class="btn btn-link mk_button">$latestNotifyOrders.get($orderDetail.getId()).get().getStatus()</button></td>
155
			    					    #else
158
			    					    #else
156
			    					    <td> </td>
159
			    					    <td> </td>
157
			    					    #end
160
			    					    #end
-
 
161
			    					    <td>$orderDetail.getTransactionId()</td>
158
		    					 		<td>$orderDetail.getRetailerName()</td>
162
		    					 		<td>$orderDetail.getRetailerName()</td>
159
                                        <td>$orderDetail.getRetailerMobileNumber()</td>
163
                                        <td>$orderDetail.getRetailerMobileNumber()</td>
160
                                        <td>$orderDetail.getLineItem().getQuantity()</td>	
164
                                        <td>$orderDetail.getLineItem().getQuantity()</td>	
161
                                        <td>$orderDetail.getRetailerCity()</td>
165
                                        <td>$orderDetail.getRetailerCity()</td>
162
                                        <td>$orderDetail.getRetailerState()</td>
166
                                        <td>$orderDetail.getRetailerState()</td>