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

Fakproducts #14

マージ済み
TechnicalSuwako が 1 個のコミットを fakproducts から master へマージ 2018-06-05 05:31:32 +09:00
会話 2 コミット 1 変更されたファイル 1 +36 -88
1個のファイルの変更、36行の追加、88行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

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

@ -1184,7 +1184,9 @@ class InvoiceController extends Controller {
'id',
'user_id',
'name',
'rate'
'price',
'intervals',
'period'
)
->get();
@ -1194,7 +1196,9 @@ class InvoiceController extends Controller {
->select(
'id',
'name',
'rate'
'price',
'intervals',
'period'
)
->where('user_id', $check)
->get();
@ -1222,7 +1226,9 @@ class InvoiceController extends Controller {
'id',
'user_id',
'name',
'rate'
'price',
'intervals',
'period'
)
->where('id', $id)
->get();
@ -1232,7 +1238,9 @@ class InvoiceController extends Controller {
->select(
'id',
'name',
'rate'
'price',
'intervals',
'period'
)
->where('id', $id)
->where('user_id', $check)
@ -1260,7 +1268,9 @@ class InvoiceController extends Controller {
->insertGetId([
'user_id' => $request->user_id,
'name' => $request->name,
'rate' => $request->rate
'price' => $request->price,
'intervals' => $request->intervals,
'period' => $request->period
]);
}
else {
@ -1268,7 +1278,9 @@ class InvoiceController extends Controller {
->insertGetId([
'user_id' => $check,
'name' => $request->name,
'rate' => $request->rate
'price' => $request->price,
'intervals' => $request->intervals,
'period' => $request->period
]);
}
@ -1296,7 +1308,9 @@ class InvoiceController extends Controller {
->update([
'user_id' => $request->user_id,
'name' => $request->name,
'rate' => $request->rate
'price' => $request->price,
'intervals' => $request->intervals,
'period' => $request->period
]);
}
else {
@ -1305,7 +1319,9 @@ class InvoiceController extends Controller {
->where('user_id', $check)
->update([
'name' => $request->name,
'rate' => $request->rate
'price' => $request->price,
'intervals' => $request->intervals,
'period' => $request->period
]);
}
@ -1396,85 +1412,26 @@ class InvoiceController extends Controller {
->select(
'id',
'user_id',
'cat_id',
'interval_id',
'name',
'intervals',
'price'
)
->where('id', $id)
->get();
$res = array();
foreach ($get as $g) {
$cat = DB::table('inv_product_categories')
->select('name')
->where('id', $g->cat_id)
->get();
$int = DB::table('inv_product_intervals')
->select('name')
->where('id', $g->interval_id)
->get();
$res[] = array(
'id' => $g->id,
'user_id' => $g->id,
'cat_id' => $g->cat_id,
'cat_name' => $cat[0]->name,
'interval_id' => $g->id,
'interval_name' => $int[0]->name,
'name' => $g->id,
'intervals' => $g->id,
'price' => $g->price
);
}
return $res;
return $get;
}
else {
$get = DB::table('inv_products')
->select(
'id',
'cat_id',
'interval_id',
'name',
'intervals',
'price'
)
->where('id', $id)
->where('user_id', $check)
->get();
$res = array();
foreach ($get as $g) {
$cat = DB::table('inv_product_categories')
->select('name')
->where('id', $g->cat_id)
->where('user_id', $check)
->get();
$int = DB::table('inv_product_intervals')
->select('name')
->where('id', $g->interval_id)
->where('user_id', $check)
->get();
$res[] = array(
'id' => $g->id,
'cat_id' => $g->cat_id,
'cat_name' => $cat[0]->name,
'interval_id' => $g->id,
'interval_name' => $int[0]->name,
'name' => $g->id,
'intervals' => $g->id,
'price' => $g->price
);
}
return $res;
return $get;
}
}
else {
@ -1498,9 +1455,7 @@ class InvoiceController extends Controller {
->insertGetId([
'user_id' => $request->user_id,
'name' => $request->name,
'int_sum' => $request->int_sum,
'int_cat' => $request->int_cat,
'price' => $request->rate
'price' => $request->price
]);
}
else {
@ -1508,9 +1463,7 @@ class InvoiceController extends Controller {
->insertGetId([
'user_id' => $check,
'name' => $request->name,
'int_sum' => $request->int_sum,
'int_cat' => $request->int_cat,
'price' => $request->rate
'price' => $request->price
]);
}
@ -1538,9 +1491,7 @@ class InvoiceController extends Controller {
->update([
'user_id' => $request->user_id,
'name' => $request->name,
'int_sum' => $request->int_sum,
'int_cat' => $request->int_cat,
'price' => $request->rate
'price' => $request->price
]);
}
else {
@ -1548,11 +1499,8 @@ class InvoiceController extends Controller {
->where('id', $request->id)
->where('user_id', $check)
->update([
'cat_id' => $request->cat_id,
'name' => $request->name,
'int_sum' => $request->int_sum,
'int_cat' => $request->int_cat,
'price' => $request->rate
'price' => $request->price
]);
}
@ -1606,7 +1554,7 @@ class InvoiceController extends Controller {
'id',
'user_id',
'name',
'rate'
'price'
)
->get();
@ -1616,7 +1564,7 @@ class InvoiceController extends Controller {
->select(
'id',
'name',
'rate'
'price'
)
->where('user_id', $check)
->get();
@ -1673,7 +1621,7 @@ class InvoiceController extends Controller {
->insertGetId([
'user_id' => $request->user_id,
'name' => $request->name,
'rate' => $request->rate
'price' => $request->price
]);
}
else {
@ -1681,7 +1629,7 @@ class InvoiceController extends Controller {
->insertGetId([
'user_id' => $check,
'name' => $request->name,
'rate' => $request->rate
'price' => $request->price
]);
}
@ -1709,7 +1657,7 @@ class InvoiceController extends Controller {
->update([
'user_id' => $request->user_id,
'name' => $request->name,
'rate' => $request->rate
'price' => $request->price
]);
}
else {
@ -1719,7 +1667,7 @@ class InvoiceController extends Controller {
->update([
'user_id' => $check,
'name' => $request->name,
'rate' => $request->rate
'price' => $request->price
]);
}