000

[33mcommit 4e8a947b5d8a6440a442c060827d732dee9d722e[m[33m ([m[1;36mHEAD -> [m[1;32majay[m[33m, [m[1;31morigin/dev[m[33m)[m
Merge: 206c0b7 d5e6810
Author: Team Leader Pmmsapp <sumit@logimetrix.co.in>
Date:   Thu Nov 10 13:34:13 2022 +0000

conflict fix live

[1mdiff --cc app/Http/Controllers/InvoiceController.php[m
[1mindex d285753,ff2bf31..fc83f61[m
[1m--- a/app/Http/Controllers/InvoiceController.php[m
[1m+++ b/app/Http/Controllers/InvoiceController.php[m
[36m@@@ -3727,11 -3727,12 +3727,14 @@@[m [mclass InvoiceController extends Control[m
                      ->withInput();[m
              } else {[m
                  $data['collection_user_id']=$request->collection_user;[m
[32m++[m
[32m+                 $data['collection_payment_mode']=$request->collection_payment_mode;[m
[32m+                [m
[32m+                 $data['field_collections'] = \App\ReceivePayment::where([['user_id','=',$request->collection_user],['mode','=',$request->collection_payment_mode],['status','=','0']])->get();[m
                 [m
[31m-                 $data['field_collections'] = \App\ReceivePayment::where(['user_id'=>$request->collection_user,'mode'=>$request->collection_payment_mode,'status'=>'0'])->get();[m
[31m-                 [m
[31m-                 $data['field_collections_amount'] = \App\ReceivePayment::where(['user_id'=>$request->collection_user,'mode'=>$request->collection_payment_mode,'status'=>'0'])->sum('amount');[m
[31m-                 //$data['field_collections'] =  \DB::table('receive_payments')->where(['user_id'=>$request->collection_user,'mode'=>$request->collection_payment_mode,'status'=>'0'])->get();[m
[32m+                 $data['field_collections_amount'] = \App\ReceivePayment::where([['user_id','=',$request->collection_user],['mode','=',$request->collection_payment_mode],['status','=','0']])->sum('amount');[m
[32m+               [m
[32m++[m
              }[m
          }[m
          // dd($data);[m
[1mdiff --cc resources/views/dashboard/invoice/field-collection.blade.php[m
[1mindex 62f9cf1,34be2b1..7de1452[m
[1m--- a/resources/views/dashboard/invoice/field-collection.blade.php[m
[1m+++ b/resources/views/dashboard/invoice/field-collection.blade.php[m
[36m@@@ -186,7 -186,7 +186,9 @@@[m
      [m
  </div>[m
  [m
[32m +[m
[32m+ @if(isset($collection_payment_mode) && ($collection_payment_mode =='Cash'))[m
[32m++[m
  <div class="modal fade" id="Denomination">[m
  	<div class="modal-dialog">[m
  		<div class="modal-content">[m
[36m@@@ -203,8 -203,9 +205,10 @@@[m
  							<th>Amount</th>[m
  						</tr>[m
  					</thead>[m
[32m++[m
[32m+ 							[m
  					@if(isset($field_collections) && !is_null($field_collections))[m
[31m- 						[m
[31m -					[m
[32m++[m
  					<tbody>[m
  						[m
  						@php [m
[36m@@@ -251,7 -251,8 +255,8 @@@[m
  		</div>[m
  	</div>[m
  </div>[m
[31m -@endif[m
[32m +[m
[32m+ [m
  @section('script')[m
  [m
  {{ Html::script("assets/js/jquery.dataTables.min.js")}}[m