Subversion Repositories SmartDukaan

Rev

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

Rev 25789 Rev 26031
Line 138... Line 138...
138 
	    						<th>State</th>
 138 
	    						<th>State</th>
139 
	    						<th>Store Code</th>
 139 
	    						<th>Store Code</th>
140 
	    						<th>Created</th>
 140 
	    						<th>Created</th>
141 
	    						<th>Cancel Order</th>
 141 
	    						<th>Cancel Order</th>
142 
	    						<th>Notify</th>
 142 
	    						<th>Notify</th>
- 
 
 143 
	    						<th>Notify</th>
143
144
144 
	    					</tr>
145 
	    					</tr>
145
146
146 
				        </thead>
 147 
				        </thead>
147 
	    				<tbody>
 148 
	    				<tbody>
Line 167... Line 168...
167 
                                        <td>$storeIdAndFofoIdMap.get($orderDetail.getRetailerId())</td>
 168 
                                        <td>$storeIdAndFofoIdMap.get($orderDetail.getRetailerId())</td>
168 
                                        <td>$orderDetail.getCreateTimestamp().format($dateTimeFormatter)</td>
 169 
                                        <td>$orderDetail.getCreateTimestamp().format($dateTimeFormatter)</td>
169 
                                        <td><button class="btn btn-primary cancellation"  data-orderid="$orderDetail.getId()" data-itemid="$orderDetail.getLineItem().getItem().getId()"  data-toggle="modal" data-target="#cancelOrder" type="button" >Cancel</button>
 170 
                                        <td><button class="btn btn-primary cancellation"  data-orderid="$orderDetail.getId()" data-itemid="$orderDetail.getLineItem().getItem().getId()"  data-toggle="modal" data-target="#cancelOrder" type="button" >Cancel</button>
170 
								     </td>
 171 
								     </td>
171
172
172 
								     <td><button class="btn btn-primary notify"  onclick="getItemColor($orderDetail.getLineItem().getItem().getCatalogItemId(),$orderDetail.getLineItem().getItem().getId())" data-toggle="modal" data-target="#notifyOrder" type="button" >Notify</button>
 173 
								     <td><button class="btn btn-primary notify"  onclick="getItemColor($orderDetail.getLineItem().getItem().getCatalogItemId(),$orderDetail.getLineItem().getItem().getId())" data-toggle="modal" data-target="#notifyOrder" type="button" >Notify Color</button>
- 
 
 174 
								       <td><button class="btn btn-primary notifyCancel"  onclick="getItems($orderDetail.getLineItem().getItem().getCatalogItemId(),$orderDetail.getId())" data-toggle="modal" data-target="#notifyCancelOrder" type="button" >Notify Cancel</button>
173 
								     </td>
 175 
								     </td>
174
176
175
177
176 
	    					</tr>
 178 
	    					</tr>
177 
	    					#end
 179 
	    					#end
Line 192... Line 194...
192 
    </div>
 194 
    </div>
193 
    </div>
 195 
    </div>
194
196
195
197
196 
	<div class="cancel-order-container">
 198 
	<div class="cancel-order-container">
197 
   <div  class="modal fade text-center" id="cancelOrder">
 199 
    <div  class="modal fade text-center" id="cancelOrder">
198 
	<div class="modal-dialog">
 200 
	<div class="modal-dialog">
199 
    <div class="modal-content" style="width:900px;">
 201 
    <div class="modal-content" style="width:900px;">
200 
    </div>
 202 
    </div>
201 
    </div>
 203 
    </div>
202 
    </div>
 204 
    </div>
203 
    </div>
 205 
    </div>
204
206
- 
 
 207 
    <div class="notify-cancel-order-container">
- 
 
 208 
    <div  class="modal fade text-center" id="notifyCancelOrder">
- 
 
 209 
	<div class="modal-dialog">
- 
 
 210 
    <div class="modal-content" style="width:900px;">
205
211 
    </div>
- 
 
 212 
    </div>
- 
 
 213 
    </div>
206 
 
 214 
    </div>
207 
 
 215 
 
208 
 
 216 
 
209
217
210 
</section>
 218 
</section>
211
219