Subversion Repositories SmartDukaan

Rev

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

Rev 17459 Rev 19500
Line 261... Line 261...
261 
                </div>
 261 
                </div>
262 
                <div class="col-xs-2">
 262 
                <div class="col-xs-2">
263 
                   <?php echo $value['type']?>
 263 
                   <?php echo $value['type']?>
264 
                </div>
 264 
                </div>
265 
                <div class="col-xs-2">
 265 
                <div class="col-xs-2">
- 
 
 266 
	                <?php if($value['type'] == 'App' || $value['type']== 'Order'){?>
266 
                  <i class="glyphicon glyphicon-plus"></i>
 267 
	                  <i class="mechange glyphicon glyphicon-plus"></i>
- 
 
 268 
	                 <?php }else{?>
- 
 
 269 
	                 &nbsp;
- 
 
 270 
	                 <?php }?>
267 
                </div>
 271 
                </div>
- 
 
 272
- 
 
 273 
                <?php if($value['type'] == 'Refund' || $value['type']== 'Adjustment'){?>
- 
 
 274 
	                  <div style="font-size:12px;padding:2px 0px 2px 15px;">
- 
 
 275 
							<b>-</b> <?php echo $value['description'];?>
- 
 
 276 
                      </div>
- 
 
 277 
                <?php }?>
- 
 
 278
- 
 
 279
268 
              </div>
 280 
              </div>
269 
 
 281 
 
270 
 
 282 
 
271 
              <div class="suborders hidden ">
 283 
              <div class="suborders hidden ">
272 
                  <?php
284 
                  <?php
Line 322... Line 334...
322 
                      </ul>
 334 
                      </ul>
323 
 
 335 
 
324 
                    <?php
 336 
                    <?php
325 
                     }
337 
                     }
326 
                    }
 338 
                    }
327 
                   } else {
 339 
                   } elseif($value['type'] == 'Order') {
328 
                  ?>
 340 
                  ?>
329 
                      <?php if(!empty($creditedOrders[$value['fortbatchid']])):?>
 341 
                      <?php if(!empty($creditedOrders[$value['fortbatchid']])):?>
330 
                        <?php foreach ($creditedOrders[$value['fortbatchid']]['data'] as $key => $value):?>
 342 
                        <?php foreach ($creditedOrders[$value['fortbatchid']]['data'] as $key => $value):?>
331 
                          <?php foreach ($value['subOrders'] as $key => $suborder):?>
343 
                          <?php foreach ($value['subOrders'] as $key => $suborder):?>
332 
 
 344 
 
Line 334... Line 346...
334 
                            <?php $suborder['merchantOrderId'] = $value['merchantOrderId'];?>
 346 
                            <?php $suborder['merchantOrderId'] = $value['merchantOrderId'];?>
335 
                            <?php echo $this->element('suborder',array('suborder'=>$suborder,'activestores'=>$activestores,'storemapping'=>$storemapping));?>
 347 
                            <?php echo $this->element('suborder',array('suborder'=>$suborder,'activestores'=>$activestores,'storemapping'=>$storemapping));?>
336 
                          <?php endforeach;?>
 348 
                          <?php endforeach;?>
337 
                        <?php endforeach;?>
 349 
                        <?php endforeach;?>
338 
                      <?php endif;?>
 350 
                      <?php endif;?>
339 
                  <?php } ?>
 351 
                  <?php }?>
340
- 
 
341
352
342 
 
 353 
 
343
- 
 
344 
              </div>
354 
              </div>
345 
            </li>
 355 
            </li>
346 
          </ul>
356 
          </ul>
347 
        <?php endforeach; ?>
357 
        <?php endforeach; ?>
348 
 
 358