Subversion Repositories SmartDukaan

Rev

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

Rev 17355 Rev 17371
Line 45... Line 45...
45 
    </div><!-- /.modal-content -->
 45 
    </div><!-- /.modal-content -->
46 
  </div><!-- /.modal-dialog -->
 46 
  </div><!-- /.modal-dialog -->
47 
</div>
 47 
</div>
48 
 
 48 
 
49 
<div class="container pendingcashbacks">
 49 
<div class="container pendingcashbacks">
50 
  <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
 50 
  <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true" style="margin-bottom:5px;">
51 
 
 51 
 
52 
    <div class="panel panel-default">
 52 
    <div class="panel panel-default">
53 
      <div class="panel-heading" role="tab" id="headingOne">
 53 
      <div class="panel-heading" role="tab" id="headingOne">
54 
        <h4 class="panel-title">
 54 
        <h4 class="panel-title">
55 
          <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
 55 
          <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
Line 77... Line 77...
77 
    	      <?php endforeach;?>
 77 
    	      <?php endforeach;?>
78 
    	    <?php endif;?>
 78 
    	    <?php endif;?>
79 
        </div>
 79 
        </div>
80 
      </div>
 80 
      </div>
81 
    </div>
 81 
    </div>
- 
 
 82 
  </div>
- 
 
 83 
 
- 
 
 84 
  <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true" style="margin-bottom:5px;">
82 
 
 85 
 
83 
    <div class="panel panel-default">
 86 
    <div class="panel panel-default">
84 
      <div class="panel-heading" role="tab" id="headingTwo">
 87 
      <div class="panel-heading" role="tab" id="headingTwo">
85 
        <h4 class="panel-title">
 88 
        <h4 class="panel-title">
86 
          <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
 89 
          <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
Line 107... Line 110...
107 
    	      <?php endforeach;?>
 110 
    	      <?php endforeach;?>
108 
    	    <?php endif;?>
 111 
    	    <?php endif;?>
109 
        </div>
 112 
        </div>
110 
      </div>
 113 
      </div>
111 
    </div>
 114 
    </div>
112 
 
 115 
  </div>
113 
<!-- </div>added   -->
 116 
<!-- </div>added   -->
- 
 
 117
114 
    <?php if(!isset($noappcashback)):?>
 118 
      <?php if(!isset($noappcashback)):?>
115 
<!-- tabs for app installs -->
 119 
<!-- tabs for app installs -->
- 
 
 120 
  <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true" style="margin-bottom:5px;">
116 
<!-- Approved Tab Start-->
 121 
<!-- Approved Tab Start-->
117 
    <div class="panel panel-default" style="margin-bottom:5px;">
 122 
    <div class="panel panel-default" style="margin-bottom:5px;">
118 
      <div class="panel-heading" role="tab" id="headingFour">
 123 
      <div class="panel-heading" role="tab" id="headingFour">
119 
        <h4 class="panel-title">
 124 
        <h4 class="panel-title">
120 
          <a data-toggle="collapse" data-parent="#accordion" href="#collapseFour" aria-expanded="true" aria-controls="collapseFour">
 125 
          <a data-toggle="collapse" data-parent="#accordion" href="#collapseFour" aria-expanded="true" aria-controls="collapseFour">
Line 216... Line 221...
216 
        <?php endfor;?>
221 
        <?php endfor;?>
217 
        </div>
 222 
        </div>
218 
      </div>
 223 
      </div>
219 
    </div>
 224 
    </div>
220 
<!-- Approved Tab closes -->
 225 
<!-- Approved Tab closes -->
- 
 
 226 
  </div>
221 
 
 227 
 
222 
<?php endif;?>
 228 
  <?php endif;?>
223 
 
 - 
 
224 
 
 229 
 
- 
 
 230 
  <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true" style="margin-bottom:5px;">
225 
 
 231 
 
226 
  <div class="panel panel-default">
 232 
    <div class="panel panel-default">
227 
    <div class="panel-heading" role="tab" id="headingThree">
 233 
      <div class="panel-heading" role="tab" id="headingThree">
228 
      <h4 class="panel-title">
 234 
        <h4 class="panel-title">
229 
        <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
 235 
          <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
230 
          <div class="row">
 236 
            <div class="row">
231 
          		<div class="col-xs-10">Credited<br/>
237 
            		<div class="col-xs-10">Credited<br/>
232 
          			<span class="cashbackrupee"></span><?php echo $creditedAmount;?> in wallet
 238 
            			<span class="cashbackrupee"></span><?php echo $creditedAmount;?> in wallet
233 
          		</div>
 239 
            		</div>
234 
          		<div class="col-xs-2">
 240 
            		<div class="col-xs-2">
235 
          			<i class="glyphicon glyphicon-plus"></i>
 241 
            			<i class="glyphicon glyphicon-plus"></i>
236 
          		</div>
 242 
            		</div>
237 
          	</div>
 243 
            	</div>
238 
        </a>
 244 
          </a>
239 
      </h4>
 245 
        </h4>
240 
    </div>
 246 
      </div>
241 
    <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
 247 
      <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
242 
      <div class="panel-body"  style="padding:1px;margin:1px;">
 248 
        <div class="panel-body"  style="padding:1px;margin:1px;">
243 
        <?php if(!empty($creditedCashbacks)):?>
 249 
          <?php if(!empty($creditedCashbacks)):?>
244 
        <ul class="list-unstyled " style="margin-bottom:2px;">
 250 
          <ul class="list-unstyled " style="margin-bottom:2px;">
245 
          <li class="row card" style="padding:1px;background:#f9fafb">
 251 
            <li class="row card" style="padding:1px;background:#f9fafb">
246 
            <div class="col-xs-5">Date</div>
 252 
              <div class="col-xs-5">Date</div>
247 
            <div class="col-xs-3">Amount</div>
 253 
              <div class="col-xs-3">Amount</div>
248 
            <div class="col-xs-2">Type</div>
 254 
              <div class="col-xs-2">Type</div>
249 
            <div class="col-xs-2">&nbsp;</div>
 255 
              <div class="col-xs-2">&nbsp;</div>
250 
        </ul>
 256 
          </ul>
251 
                <!-- AppCredit start-->
 257 
                  <!-- AppCredit start-->
252 
        <?php foreach (array_reverse($creditKeyArray) as $key => $value): ?>
 258 
          <?php foreach (array_reverse($creditKeyArray) as $key => $value): ?>
253 
          <ul class="list-unstyled " style='margin:1px';>
 259 
            <ul class="list-unstyled " style='margin:1px';>
254 
            <li class="row">
 260 
              <li class="row">
255 
              <div class="creditedcashbacks card row" style="padding:0px;margin:0px;background:#f9fafb">
 261 
                <div class="creditedcashbacks card row" style="padding:0px;margin:0px;background:#f9fafb">
256 
                <div class="col-xs-5">
 262 
                  <div class="col-xs-5">
257 
                  <?php echo date('d M',strtotime($value['creditedDate']));?>
 263 
                    <?php echo date('d M',strtotime($value['creditedDate']));?>
258 
                </div>
 264 
                  </div>
259 
                <div class="col-xs-3">
 265 
                  <div class="col-xs-3">
260 
                  <span class="cashbackrupee"></span><?php echo $value['amount'];?>
 266 
                    <span class="cashbackrupee"></span><?php echo $value['amount'];?>
261 
                </div>
 267 
                  </div>
262 
                <div class="col-xs-2">
 268 
                  <div class="col-xs-2">
263 
                   <?php echo $value['type']?>
 269 
                     <?php echo $value['type']?>
264 
                </div>
 270 
                  </div>
265 
                <div class="col-xs-2">
 271 
                  <div class="col-xs-2">
266 
                  <i class="glyphicon glyphicon-plus"></i>
 272 
                    <i class="glyphicon glyphicon-plus"></i>
- 
 
 273 
                  </div>
267 
                </div>
 274 
                </div>
268 
              </div>
 - 
 
269 
 
 275 
 
270 
 
 276 
 
271 
              <div class="suborders hidden ">
 277 
                <div class="suborders hidden ">
272 
                  <?php
278 
                    <?php
273 
                    if($value['type'] == 'App')
 279 
                      if($value['type'] == 'App')
274 
                    {
 280 
                      {
275 
                  ?>
 281 
                    ?>
276 
 
 282 
 
277 
                  <ul class="list-unstyled " style='margin:1px';>
 - 
 
278 
                        <li class="row row_style">
 - 
 
279 
                          <div class="creditedcashbacks card row" style="padding:0px;margin:0px;background:#f9fafb">
 - 
 
280 
                            <div class="col-xs-5">
 - 
 
281 
                              &nbsp;
 - 
 
282 
                            </div>
 - 
 
283 
                            <div class="col-xs-3">
 - 
 
284 
                              Amount
 - 
 
285 
                            </div>
 - 
 
286 
                            <div class="col-xs-2">
 - 
 
287 
                              Number
 - 
 
288 
                            </div>
 - 
 
289 
                            <div class="col-xs-2">
 - 
 
290 
                              &nbsp;
 - 
 
291 
                            </div>
 - 
 
292 
                          </div>
 - 
 
293 
                        </li>
 - 
 
294 
                  </ul>
 - 
 
295 
 
 - 
 
296 
                  <?php
 - 
 
297 
                      foreach ($creditedFortnight[$value['fortbatchid']] as $key => $row) {
 - 
 
298 
                        foreach (array_reverse($row) as $key => $value) {
- 
 
299 
                  ?>
 - 
 
300 
                    <ul class="list-unstyled " style='margin:1px';>
 283 
                    <ul class="list-unstyled " style='margin:1px';>
301 
                        <li class="row creditappinstalls row_style" data-fetch="c<?php echo $value['dateVal']?>" data-date="<?php echo $value['dateVal'];?>">
 284 
                          <li class="row row_style">
302 
                          <div class="creditedcashbacks card row" style="padding:0px;margin:0px;background:#f9fafb">
 285 
                            <div class="creditedcashbacks card row" style="padding:0px;margin:0px;background:#f9fafb">
303 
                            <div class="col-xs-5">
 286 
                              <div class="col-xs-5">
304 
                              <?php echo date('d M',strtotime($value['dateVal']));?>
 287 
                                &nbsp;
305 
                            </div>
 288 
                              </div>
306 
                            <div class="col-xs-3">
 289 
                              <div class="col-xs-3">
307 
                              <span class="cashbackrupee"></span><?php echo $value['amount']?>
 290 
                                Amount
308 
                            </div>
 291 
                              </div>
309 
                            <div class="col-xs-2">
 292 
                              <div class="col-xs-2">
310 
                              <?php echo $value['downloads'];?>
 293 
                                Number
311 
                            </div>
 294 
                              </div>
312 
                            <div class="col-xs-2">
 295 
                              <div class="col-xs-2">
313 
                              <i class="glyphicon glyphicon-plus"></i>
 296 
                                &nbsp;
- 
 
 297 
                              </div>
314 
                            </div>
 298 
                            </div>
315 
                          </div>
 299 
                          </li>
316 
                          <div class="suborders hidden" id ="c<?php echo $value['dateVal']?>">
 - 
 
317 
                            <div class="panel-body approved_panel">
 300 
                    </ul>
318 
 
 301 
 
- 
 
 302 
                    <?php
- 
 
 303 
                        foreach ($creditedFortnight[$value['fortbatchid']] as $key => $row) {
- 
 
 304 
                          foreach (array_reverse($row) as $key => $value) {
- 
 
 305 
                    ?>
- 
 
 306 
                      <ul class="list-unstyled " style='margin:1px';>
- 
 
 307 
                          <li class="row creditappinstalls row_style" data-fetch="c<?php echo $value['dateVal']?>" data-date="<?php echo $value['dateVal'];?>">
- 
 
 308 
                            <div class="creditedcashbacks card row" style="padding:0px;margin:0px;background:#f9fafb">
- 
 
 309 
                              <div class="col-xs-5">
- 
 
 310 
                                <?php echo date('d M',strtotime($value['dateVal']));?>
- 
 
 311 
                              </div>
- 
 
 312 
                              <div class="col-xs-3">
- 
 
 313 
                                <span class="cashbackrupee"></span><?php echo $value['amount']?>
- 
 
 314 
                              </div>
- 
 
 315 
                              <div class="col-xs-2">
- 
 
 316 
                                <?php echo $value['downloads'];?>
- 
 
 317 
                              </div>
- 
 
 318 
                              <div class="col-xs-2">
- 
 
 319 
                                <i class="glyphicon glyphicon-plus"></i>
- 
 
 320 
                              </div>
319 
                            </div>
 321 
                            </div>
320 
                          </div>
322 
                            <div class="suborders hidden" id ="c<?php echo $value['dateVal']?>">
321 
                        </li>
 323 
                              <div class="panel-body approved_panel">
322 
                      </ul>
 - 
 
323 
 
 324 
 
- 
 
 325 
                              </div>
- 
 
 326 
                            </div>
- 
 
 327 
                          </li>
- 
 
 328 
                        </ul>
- 
 
 329 
 
324 
                    <?php
 330 
                      <?php
325 
                     }
331 
                       }
326 
                    }
 332 
                      }
327 
                   } else {
 333 
                     } else {
328 
                  ?>
 334 
                    ?>
329 
                      <?php if(!empty($creditedOrders[$value['fortbatchid']])):?>
 335 
                        <?php if(!empty($creditedOrders[$value['fortbatchid']])):?>
330 
                        <?php foreach ($creditedOrders[$value['fortbatchid']]['data'] as $key => $value):?>
 336 
                          <?php foreach ($creditedOrders[$value['fortbatchid']]['data'] as $key => $value):?>
331 
                          <?php foreach ($value['subOrders'] as $key => $suborder):?>
337 
                            <?php foreach ($value['subOrders'] as $key => $suborder):?>
332 
 
 338 
 
333 
                            <?php $suborder['storeId'] = $value['storeId'];?>
 339 
                              <?php $suborder['storeId'] = $value['storeId'];?>
334 
                            <?php $suborder['merchantOrderId'] = $value['merchantOrderId'];?>
 340 
                              <?php $suborder['merchantOrderId'] = $value['merchantOrderId'];?>
335 
                            <?php echo $this->element('suborder',array('suborder'=>$suborder,'activestores'=>$activestores,'storemapping'=>$storemapping));?>
 341 
                              <?php echo $this->element('suborder',array('suborder'=>$suborder,'activestores'=>$activestores,'storemapping'=>$storemapping));?>
- 
 
 342 
                            <?php endforeach;?>
336 
                          <?php endforeach;?>
 343 
                          <?php endforeach;?>
337 
                        <?php endforeach;?>
 - 
 
338 
                      <?php endif;?>
 344 
                        <?php endif;?>
339 
                  <?php } ?>
 345 
                    <?php } ?>
340
346
341
347
342 
 
 348 
 
343
349
344 
              </div>
350 
                </div>
345 
            </li>
 351 
              </li>
346 
          </ul>
352 
            </ul>
347 
        <?php endforeach; ?>
353 
          <?php endforeach; ?>
348 
 
 354 
 
349
355
350 
 
 356 
 
351 
        <!-- AppCredit close -->
 357 
          <!-- AppCredit close -->
352 
        <?php //foreach ($creditedCashbacks['data'] as $key => $value):?>
358 
          <?php //foreach ($creditedCashbacks['data'] as $key => $value):?>
353 
 <!--          <ul class="list-unstyled " style="margin-bottom:2px;">
 359 
   <!--          <ul class="list-unstyled " style="margin-bottom:2px;">
354 
        		<li class="row" style="padding:1px;background:#f9fafb">
 360 
          		<li class="row" style="padding:1px;background:#f9fafb">
355 
              <div class="creditedcashbacks card row">
 361 
                <div class="creditedcashbacks card row">
356 
                <div class="col-xs-5">
 362 
                  <div class="col-xs-5">
357 
                  <?php echo date('d M',strtotime($value['timestamp']));?>
 363 
                    <?php echo date('d M',strtotime($value['timestamp']));?>
358 
                </div>
 364 
                  </div>
359 
                <div class="col-xs-3">
 365 
                  <div class="col-xs-3">
360 
                  <?php echo $value['type'];?>
 366 
                    <?php echo $value['type'];?>
361 
                </div>
 367 
                  </div>
362 
                <div class="col-xs-2">
 368 
                  <div class="col-xs-2">
363 
                  <span class="cashbackrupee"></span><?php echo $value['userAmount'];?>
 369 
                    <span class="cashbackrupee"></span><?php echo $value['userAmount'];?>
364 
                </div>
 370 
                  </div>
365 
                <div class="col-xs-2">
 371 
                  <div class="col-xs-2">
366 
                  <i class="glyphicon glyphicon-plus"></i>
 372 
                    <i class="glyphicon glyphicon-plus"></i>
- 
 
 373 
                  </div>
367 
                </div>
 374 
                </div>
368 
              </div>
 - 
 
369 
              <div class="suborders hidden">
 375 
                <div class="suborders hidden">
370 
                <?php if(!empty($creditedOrders[$value['batch']])):?>
 376 
                  <?php if(!empty($creditedOrders[$value['batch']])):?>
371 
                  <?php foreach ($creditedOrders[$value['batch']]['data'] as $key => $value):?>
 377 
                    <?php foreach ($creditedOrders[$value['batch']]['data'] as $key => $value):?>
372 
                    <?php foreach ($value['subOrders'] as $key => $suborder):?>
378 
                      <?php foreach ($value['subOrders'] as $key => $suborder):?>
373 
 
 379 
 
374 
                      <?php $suborder['storeId'] = $value['storeId'];?>
 380 
                        <?php $suborder['storeId'] = $value['storeId'];?>
375 
                      <?php $suborder['merchantOrderId'] = $value['merchantOrderId'];?>
 381 
                        <?php $suborder['merchantOrderId'] = $value['merchantOrderId'];?>
376 
                      <?php echo $this->element('suborderwd',array('suborder'=>$suborder,'activestores'=>$activestores,'storemapping'=>$storemapping));?>
 382 
                        <?php echo $this->element('suborderwd',array('suborder'=>$suborder,'activestores'=>$activestores,'storemapping'=>$storemapping));?>
- 
 
 383 
                      <?php endforeach;?>
377 
                    <?php endforeach;?>
 384 
                    <?php endforeach;?>
378 
                  <?php endforeach;?>
 - 
 
379 
                <?php endif;?>
 385 
                  <?php endif;?>
380 
              </div>
386 
                </div>
381 
        		</li>
 387 
          		</li>
382 
          </ul>
388 
            </ul>
383 
    	<?php //endforeach;?> -->
 389 
      	<?php //endforeach;?> -->
384 
    	<?php endif;?>
 390 
      	<?php endif;?>
- 
 
 391 
        </div>
385 
      </div>
 392 
      </div>
386 
    </div>
 393 
    </div>
387 
  </div>
 394 
  </div>
- 
 
 395 
 
388 
</div>
 396
- 
 
 397 
 
389 
</div>
 398 
</div>
390 
<?php
399 
<?php
391 
// if(!function_exists('formatOrderDate')){
 400 
// if(!function_exists('formatOrderDate')){
392 
	function formatOrderDate($date,$storeId,$type='od'){
 401 
	function formatOrderDate($date,$storeId,$type='od'){
393 
		if($type=='od'){
 402 
		if($type=='od'){