このコミットが含まれているのは:
テクニカル諏訪子 2018-05-04 21:19:35 +09:00
コミット 7a9417c364
1個のファイルの変更32行の追加10行の削除

ファイルの表示

@ -77,7 +77,9 @@ class InvoiceController extends Controller {
'bank_recipient',
'logo',
'payterm',
'date_format'
'date_format',
'comment1',
'comment2'
)
->where('id', $id)
->where('user_id', $check)
@ -99,7 +101,9 @@ class InvoiceController extends Controller {
'bank_recipient',
'logo',
'payterm',
'date_format'
'date_format',
'comment1',
'comment2'
)
->where('id', $id)
->get();
@ -135,7 +139,9 @@ class InvoiceController extends Controller {
'bank_recipient' => $request->bank_recipient,
'logo' => ($request->logo ? $request->logo : ''),
'payterm' => $request->payterm,
'date_format' => $request->date_format
'date_format' => $request->date_format,
'comment1' => $request->comment1,
'comment2' => $request->comment2
]);
return $add;
@ -170,7 +176,9 @@ class InvoiceController extends Controller {
'bank_recipient' => $request->bank_recipient,
'logo' => ($request->logo ? $request->logo : ''),
'payterm' => $request->payterm,
'date_format' => $request->date_format
'date_format' => $request->date_format,
'comment1' => $request->comment1,
'comment2' => $request->comment2
]);
}
else {
@ -321,7 +329,9 @@ class InvoiceController extends Controller {
'town',
'country',
'phone',
'email'
'website',
'email',
'custom'
)
->where('id', $id)
->get();
@ -347,7 +357,9 @@ class InvoiceController extends Controller {
'town',
'country',
'phone',
'email'
'website',
'email',
'custom'
)
->where('id', $id)
->where('user_id', $check)
@ -379,7 +391,9 @@ class InvoiceController extends Controller {
'town' => $g->town,
'country' => $g->country,
'phone' => $g->phone,
'website' => $g->website,
'email' => $g->email,
'custom' => $g->custom,
'isEmployer' => ($emp->count() ? true : false),
'isCustomer' => ($cus->count() ? true : false)
);
@ -414,7 +428,9 @@ class InvoiceController extends Controller {
'town' => $request->town,
'country' => $request->country,
'phone' => $request->phone,
'email' => $request->email
'website' => $request->website,
'email' => $request->email,
'custom' => $request->custom
]);
if ($request->isCustomer) {
@ -443,7 +459,9 @@ class InvoiceController extends Controller {
'town' => $request->town,
'country' => $request->country,
'phone' => $request->phone,
'email' => $request->email
'website' => $request->website,
'email' => $request->email,
'custom' => $request->custom
]);
if ($request->isCustomer) {
@ -493,7 +511,9 @@ class InvoiceController extends Controller {
'town' => $request->town,
'country' => $request->country,
'phone' => $request->phone,
'email' => $request->email
'website' => $request->website,
'email' => $request->email,
'custom' => $request->custom
]);
$emp = DB::table('inv_employers')
@ -550,7 +570,9 @@ class InvoiceController extends Controller {
'town' => $request->town,
'country' => $request->country,
'phone' => $request->phone,
'email' => $request->email
'website' => $request->website,
'email' => $request->email,
'custom' => $request->custom
]);
$emp = DB::table('inv_employers')