suwako
/
076server
アーカイブ
1
0
フォーク 0
コード イシュー プルリクエスト プロジェクト リリース Wiki アクティビティ

New address format.

このコミットが含まれているのは:
テクニカル諏訪子 2018-06-08 04:23:32 +09:00
親 fe017c4265
コミット 0da934cb40
1個のファイルの変更、16行の追加、46行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

62
app/Http/Controllers/InvoiceController.php
ファイルの表示

@ -246,10 +246,7 @@ class InvoiceController extends Controller {
'inv_contacts.user_id',
'inv_contacts.company_name',
'inv_contacts.name',
'inv_contacts.address',
'inv_contacts.postcode',
'inv_contacts.town',
'inv_contacts.country',
'inv_contacts.fulladdress',
'inv_contacts.phone',
'inv_contacts.email'
);
@ -272,10 +269,7 @@ class InvoiceController extends Controller {
'user_id',
'company_name',
'name',
'address',
'postcode',
'town',
'country',
'fulladdress',
'phone',
'email'
)
@ -290,10 +284,7 @@ class InvoiceController extends Controller {
'id',
'company_name',
'name',
'address',
'postcode',
'town',
'country',
'fulladdress',
'phone',
'email'
)
@ -326,10 +317,7 @@ class InvoiceController extends Controller {
'user_id',
'company_name',
'name',
'address',
'postcode',
'town',
'country',
'fulladdress',
'phone',
'website',
'email',
@ -354,10 +342,7 @@ class InvoiceController extends Controller {
'id',
'company_name',
'name',
'address',
'postcode',
'town',
'country',
'fulladdress',
'phone',
'website',
'email',
@ -388,10 +373,7 @@ class InvoiceController extends Controller {
'user_id' => ($valid['inv_manuser'] === 1 ? $g->user_id : $check),
'company_name' => $g->company_name,
'name' => $g->name,
'address' => $g->address,
'postcode' => $g->postcode,
'town' => $g->town,
'country' => $g->country,
'fulladdress' => $g->fulladdress,
'phone' => $g->phone,
'website' => $g->website,
'email' => $g->email,
@ -425,10 +407,7 @@ class InvoiceController extends Controller {
'user_id' => $request->user_id,
'company_name' => $request->company_name,
'name' => $request->name,
'address' => $request->address,
'postcode' => $request->postcode,
'town' => $request->town,
'country' => $request->country,
'fulladdress' => $request->fulladdress,
'phone' => $request->phone,
'website' => $request->website,
'email' => $request->email,
@ -456,10 +435,7 @@ class InvoiceController extends Controller {
->insertGetId([
'company_name' => $request->company_name,
'name' => $request->name,
'address' => $request->address,
'postcode' => $request->postcode,
'town' => $request->town,
'country' => $request->country,
'fulladdress' => $request->fulladdress,
'phone' => $request->phone,
'website' => $request->website,
'email' => $request->email,
@ -508,10 +484,7 @@ class InvoiceController extends Controller {
'user_id' => $request->user_id,
'company_name' => $request->company_name,
'name' => $request->name,
'address' => $request->address,
'postcode' => $request->postcode,
'town' => $request->town,
'country' => $request->country,
'fulladdress' => $request->fulladdress,
'phone' => $request->phone,
'website' => $request->website,
'email' => $request->email,
@ -567,10 +540,7 @@ class InvoiceController extends Controller {
->update([
'company_name' => $request->company_name,
'name' => $request->name,
'address' => $request->address,
'postcode' => $request->postcode,
'town' => $request->town,
'country' => $request->country,
'fulladdress' => $request->fulladdress,
'phone' => $request->phone,
'website' => $request->website,
'email' => $request->email,
@ -789,19 +759,19 @@ class InvoiceController extends Controller {
$desS = array();
$self = DB::table('inv_contacts')
->select('id', 'company_name', 'name', 'address', 'postcode', 'town', 'country', 'phone', 'website', 'email', 'custom')
->select('id', 'company_name', 'name', 'fulladdress', 'phone', 'website', 'email', 'custom')
->where('id', $u->user_id)
->where('user_id', $u->user_id)
->get();
$cus = DB::table('inv_contacts')
->select('id', 'company_name', 'name', 'address', 'postcode', 'town', 'country', 'phone', 'website', 'email', 'custom')
->select('id', 'company_name', 'name', 'fulladdress', 'phone', 'website', 'email', 'custom')
->where('id', $invoice[0]->customer)
->where('user_id', $u->user_id)
->get();
$emp = DB::table('inv_contacts')
->select('id', 'company_name', 'name', 'address', 'postcode', 'town', 'country', 'phone', 'website', 'email', 'custom')
->select('id', 'company_name', 'name', 'fulladdress', 'phone', 'website', 'email', 'custom')
->where('id', $invoice[0]->employer)
->where('user_id', $u->user_id)
->get();
@ -956,19 +926,19 @@ class InvoiceController extends Controller {
$desS = array();
$self = DB::table('inv_contacts')
->select('id', 'company_name', 'name', 'address', 'postcode', 'town', 'country', 'phone', 'website', 'email', 'custom')
->select('id', 'company_name', 'name', 'fulladdress', 'phone', 'website', 'email', 'custom')
->where('id', $check)
->where('user_id', $check)
->get();
$cus = DB::table('inv_contacts')
->select('id', 'company_name', 'name', 'address', 'postcode', 'town', 'country', 'phone', 'website', 'email', 'custom')
->select('id', 'company_name', 'name', 'fulladdress', 'phone', 'website', 'email', 'custom')
->where('id', $invoice[0]->customer)
->where('user_id', $check)
->get();
$emp = DB::table('inv_contacts')
->select('id', 'company_name', 'name', 'address', 'postcode', 'town', 'country', 'phone', 'website', 'email', 'custom')
->select('id', 'company_name', 'name', 'fulladdress', 'phone', 'website', 'email', 'custom')
->where('id', $invoice[0]->employer)
->where('user_id', $check)
->get();