瀏覽代碼

added company pro on transaction create

= 3 年之前
父節點
當前提交
8bd99fe297

+ 5 - 2
app/Http/Controllers/pros_SINGLE_Controller.php

@@ -3,6 +3,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Pro;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Auth;
@@ -741,7 +742,8 @@ class pros_SINGLE_Controller extends Controller
 			$record = DB::table('pro')->where('id', $uid)->first();
 			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_add_new_credit_pro_transaction');
 		}
-		return response()->view('admin/pros_SINGLE/ACTION_add_new_credit_pro_transaction', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		$pro  = Pro::find($record->id);
+		return response()->view('admin/pros_SINGLE/ACTION_add_new_credit_pro_transaction', compact('record', 'pro'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_add_new_debit_pro_transaction
@@ -751,7 +753,8 @@ class pros_SINGLE_Controller extends Controller
 			$record = DB::table('pro')->where('id', $uid)->first();
 			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_add_new_debit_pro_transaction');
 		}
-		return response()->view('admin/pros_SINGLE/ACTION_add_new_debit_pro_transaction', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		$pro  = Pro::find($record->id);
+		return response()->view('admin/pros_SINGLE/ACTION_add_new_debit_pro_transaction', compact('record', 'pro'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_add_new_stag_app_pro_access

+ 19 - 0
app/Models/CompanyPro.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class CompanyPro extends Model
+{
+    protected $table = 'company_pro';
+
+
+    public function company(){
+        return $this->hasOne(Company::class, 'id', 'company_id');
+    }
+
+    public function pro(){
+        return $this->hasOne(Pro::class, 'id', 'pro_id');
+    }
+}

+ 5 - 0
app/Models/Pro.php

@@ -19,4 +19,9 @@ class Pro extends Model
         return $this->hasOne(Company::class, 'id', 'company_id');
     }
 
+    public function companyPros()
+    {
+        return $this->hasMany(CompanyPro::class, 'pro_id', 'id');
+    }
+
 }

+ 23 - 12
resources/views/admin/pros_SINGLE/ACTION_add_new_credit_pro_transaction.blade.php

@@ -1,3 +1,5 @@
+<?php /* DO NOT GENERATE */ ?>
+
 @extends('admin.pros.view')
 @section('content-inner')
 
@@ -27,18 +29,27 @@
         <input type="hidden" name="_success" value="{{route('pros_SINGLE-SUB_transactions', ['uid' => $record->uid])}}">
         <input type="hidden" name="_return" value="{{route('pros_SINGLE-ACTION_add_new_credit_pro_transaction', ['uid' => $record->uid])}}">
         <input class='form-control' type='hidden' name='proUid' value='{{ old('proUid') ? old('proUid') : $record->uid }}' >
-<div class='form-group mb-3'>
-<label class='control-label'>Amount </label>
-<input class='form-control' type='text' name='amount' value='{{ old('amount') ? old('amount') : '' }}' >
-</div>
-<div class='form-group mb-3'>
-<label class='control-label'>Intended Resulting Balance </label>
-<input class='form-control' type='text' name='intendedResultingBalance' value='{{ old('intendedResultingBalance') ? old('intendedResultingBalance') : '' }}' >
-</div>
-<div class='form-group mb-3'>
-<label class='control-label'>Custom Memo </label>
-<input class='form-control' type='text' name='customMemo' value='{{ old('customMemo') ? old('customMemo') : '' }}' >
-</div>
+        <div class="form-group mb-3">
+            <lable class="control-label">Company Pro</lable>
+            <select name="companyProUid"  class="form-control">
+                <option value="">--</option>
+                @foreach($pro->companyPros as $companyPro)
+                    <option value="{{$companyPro->uid}}">{{$companyPro->company->name}}</option>
+                @endforeach 
+            </select>
+        </div>
+        <div class='form-group mb-3'>
+            <label class='control-label'>Amount </label>
+            <input class='form-control' type='text' name='amount' value='{{ old('amount') ? old('amount') : '' }}' >
+        </div>
+        <div class='form-group mb-3'>
+            <label class='control-label'>Intended Resulting Balance </label>
+            <input class='form-control' type='text' name='intendedResultingBalance' value='{{ old('intendedResultingBalance') ? old('intendedResultingBalance') : '' }}' >
+        </div>
+        <div class='form-group mb-3'>
+            <label class='control-label'>Custom Memo </label>
+            <input class='form-control' type='text' name='customMemo' value='{{ old('customMemo') ? old('customMemo') : '' }}' >
+        </div>
         <div class="form-group mb-3 d-flex justify-content-center">
             <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
             <a href="{{route('pros_SINGLE-SUB_transactions', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>

+ 23 - 13
resources/views/admin/pros_SINGLE/ACTION_add_new_debit_pro_transaction.blade.php

@@ -1,3 +1,5 @@
+<?php /* DO NOT GENERATE */ ?>
+
 @extends('admin.pros.view')
 @section('content-inner')
 
@@ -26,19 +28,27 @@
         <input type="hidden" name="_api" value="/api/proTransaction/createManualMinusForPro">
         <input type="hidden" name="_success" value="{{route('pros_SINGLE-SUB_transactions', ['uid' => $record->uid])}}">
         <input type="hidden" name="_return" value="{{route('pros_SINGLE-ACTION_add_new_debit_pro_transaction', ['uid' => $record->uid])}}">
-        <input class='form-control' type='hidden' name='proUid' value='{{ old('proUid') ? old('proUid') : $record->uid }}' >
-<div class='form-group mb-3'>
-<label class='control-label'>Amount </label>
-<input class='form-control' type='text' name='amount' value='{{ old('amount') ? old('amount') : '' }}' >
-</div>
-<div class='form-group mb-3'>
-<label class='control-label'>Intended Resulting Balance </label>
-<input class='form-control' type='text' name='intendedResultingBalance' value='{{ old('intendedResultingBalance') ? old('intendedResultingBalance') : '' }}' >
-</div>
-<div class='form-group mb-3'>
-<label class='control-label'>Custom Memo </label>
-<input class='form-control' type='text' name='customMemo' value='{{ old('customMemo') ? old('customMemo') : '' }}' >
-</div>
+        <div class="form-group mb-3">
+            <lable class="control-label">Company Pro</lable>
+            <select name="companyProUid"  class="form-control">
+                <option value="">--</option>
+                @foreach($pro->companyPros as $companyPro)
+                    <option value="{{$companyPro->uid}}">{{$companyPro->company->name}}</option>
+                @endforeach 
+            </select>
+        </div>
+        <div class='form-group mb-3'>
+            <label class='control-label'>Amount </label>
+            <input class='form-control' type='text' name='amount' value='{{ old('amount') ? old('amount') : '' }}' >
+        </div>
+        <div class='form-group mb-3'>
+            <label class='control-label'>Intended Resulting Balance </label>
+            <input class='form-control' type='text' name='intendedResultingBalance' value='{{ old('intendedResultingBalance') ? old('intendedResultingBalance') : '' }}' >
+        </div>
+        <div class='form-group mb-3'>
+            <label class='control-label'>Custom Memo </label>
+            <input class='form-control' type='text' name='customMemo' value='{{ old('customMemo') ? old('customMemo') : '' }}' >
+        </div>
         <div class="form-group mb-3 d-flex justify-content-center">
             <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
             <a href="{{route('pros_SINGLE-SUB_transactions', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>