Procházet zdrojové kódy

成り代わり機能 追加

develop
sosuke.iwabuchi před 2 roky
rodič
revize
40a678407e
10 změnil soubory, kde provedl 94 přidání a 7 odebrání
  1. +46
    -0
      app/Http/Controllers/Web/Auth/ChangeContractController.php
  2. +19
    -0
      app/Http/Controllers/Web/Auth/ChangeContractParam.php
  3. +2
    -0
      app/Http/Controllers/Web/Auth/LoginController.php
  4. +6
    -0
      app/Http/Controllers/Web/Auth/LogoutController.php
  5. +4
    -2
      app/Http/Controllers/Web/Auth/Me.php
  6. +5
    -1
      app/Http/Controllers/Web/Custom/HelloTechno/ReceiptIssuingOrdersController.php
  7. +5
    -2
      app/Http/Controllers/Web/Custom/HelloTechno/UseSummariesController.php
  8. +5
    -1
      app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php
  9. +1
    -1
      app/Models/Ex/LoginUser.php
  10. +1
    -0
      routes/api.php

+ 46
- 0
app/Http/Controllers/Web/Auth/ChangeContractController.php Zobrazit soubor

@@ -0,0 +1,46 @@
<?php

namespace App\Http\Controllers\Web\Auth;

use App\Codes\UserRole;
use App\Features\LoginUser;
use App\Http\Controllers\Web\WebController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;

class ChangeContractController extends WebController
{
use Me, LoginUser;

public function name(): string
{
return "成り代わり";
}

public function description(): string
{
return "成り代わりを開始する";
}


public function __construct(protected ChangeContractParam $param)
{
parent::__construct();
$this->roleAllow(UserRole::SUPER_ADMIN);
}

protected function run(Request $request): JsonResponse
{
$param = $this->param;

$this->loginUser()->setCurrentContractId($param->contractId);

$me = $this->me();

if ($me !== null) {
return $this->successResponse($me);
}

return $this->failedResponse();
}
}

+ 19
- 0
app/Http/Controllers/Web/Auth/ChangeContractParam.php Zobrazit soubor

@@ -0,0 +1,19 @@
<?php

namespace App\Http\Controllers\Web\Auth;

use App\Http\Controllers\Web\BaseParam;
use App\Models\User;

/**
* @property ?string $contractId
*/
class ChangeContractParam extends BaseParam
{
public function rules(): array
{
return [
User::COL_NAME_CONTRACT_ID => $this->str(true),
];
}
}

+ 2
- 0
app/Http/Controllers/Web/Auth/LoginController.php Zobrazit soubor

@@ -42,6 +42,8 @@ class LoginController extends WebController
'password' => $param->password,
])) {

$this->loginUser()->setCurrentContractId(null);

$me = $this->me();

if ($me !== null) {


+ 6
- 0
app/Http/Controllers/Web/Auth/LogoutController.php Zobrazit soubor

@@ -2,6 +2,7 @@

namespace App\Http\Controllers\Web\Auth;

use App\Features\LoginUser;
use App\Http\Controllers\Web\Auth\LogoutParam;
use App\Http\Controllers\Web\WebController;
use Illuminate\Http\JsonResponse;
@@ -10,6 +11,8 @@ use Illuminate\Support\Facades\Auth;

class LogoutController extends WebController
{
use LoginUser;

public function name(): string
{
return "ログアウト";
@@ -27,6 +30,9 @@ class LogoutController extends WebController
protected function run(Request $request): JsonResponse
{
Auth::logout();

$this->loginUser()->setCurrentContractId(null);

return $this->successResponse();
}
}

+ 4
- 2
app/Http/Controllers/Web/Auth/Me.php Zobrazit soubor

@@ -3,7 +3,6 @@
namespace App\Http\Controllers\Web\Auth;

use App\Models\User;
use App\Codes\UserRole;
use App\Features\LoginUser;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Auth;
@@ -30,7 +29,10 @@ trait Me
$filteredUser[User::COL_NAME_CONTRACT_ID] = $contract->id;
$filteredUser['contract_name'] = $contract->name;
$filteredUser['custom'] = $contract->custom();
};
} else {
$filteredUser[User::COL_NAME_CONTRACT_ID] = null;
}

return $filteredUser;
}
return null;


+ 5
- 1
app/Http/Controllers/Web/Custom/HelloTechno/ReceiptIssuingOrdersController.php Zobrazit soubor

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Web\Custom\HelloTechno;

use App\Codes\UserRole;
use App\Features\LoginUser;
use App\Http\Controllers\Web\IParam;
use App\Models\ReceiptIssuingOrder as Order;
use App\Repositories\Custom\HelloTechno\ReceiptIssuingOrderRepository;
@@ -12,6 +13,9 @@ use Illuminate\Support\Facades\Auth;

class ReceiptIssuingOrdersController extends HelloTechnoController
{

use LoginUser;

public function name(): string
{
return "[HelloTechno専用]領収証発行依頼作成";
@@ -41,7 +45,7 @@ class ReceiptIssuingOrdersController extends HelloTechnoController

$condition = [
...$param->toArray(),
ReceiptIssuingOrderRepository::CONDITION_CONTRACT_ID => Auth::user()->contract_id,
ReceiptIssuingOrderRepository::CONDITION_CONTRACT_ID => $this->loginUser()->getCurrentContractId(),
];

$list = $this->repository->get($condition);


+ 5
- 2
app/Http/Controllers/Web/Custom/HelloTechno/UseSummariesController.php Zobrazit soubor

@@ -3,14 +3,17 @@
namespace App\Http\Controllers\Web\Custom\HelloTechno;

use App\Codes\UserRole;
use App\Features\LoginUser;
use App\Http\Controllers\Web\IParam;
use App\Repositories\Custom\HelloTechno\UseSummaryRepository as Repository;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;

class UseSummariesController extends HelloTechnoController
{

use LoginUser;

public function name(): string
{
return "[HelloTechno専用]利用実績一覧取得";
@@ -40,7 +43,7 @@ class UseSummariesController extends HelloTechnoController

$condition = [
...$param->toArray(),
Repository::CONDITION_CONTRACT_ID => Auth::user()->contract_id,
Repository::CONDITION_CONTRACT_ID => $this->loginUser()->getCurrentContractId(),
];

$list = $this->repository->get($condition);


+ 5
- 1
app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php Zobrazit soubor

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Web\Custom\HelloTechno;

use App\Codes\UserRole;
use App\Features\LoginUser;
use App\Files\CsvFile;
use App\Http\Controllers\Web\IParam;
use App\Repositories\Custom\HelloTechno\UseSummaryRepository as Repository;
@@ -12,6 +13,9 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;

class UseSummaryCSVController extends HelloTechnoController
{

use LoginUser;

public function name(): string
{
return "[HelloTechno専用]利用実績一覧CSV取得";
@@ -41,7 +45,7 @@ class UseSummaryCSVController extends HelloTechnoController

$condition = [
...$param->toArray(),
Repository::CONDITION_CONTRACT_ID => Auth::user()->contract_id,
Repository::CONDITION_CONTRACT_ID => $this->loginUser()->getCurrentContractId(),
Repository::CONDITION_SORT_TARGET => 'customer_code',
];



+ 1
- 1
app/Models/Ex/LoginUser.php Zobrazit soubor

@@ -49,7 +49,7 @@ class LoginUser
return $contractId === $this->user()->contract_id;
}

public function setCurrentContractId(string $contractId)
public function setCurrentContractId(?string $contractId)
{
$user = $this->user();
if ($user && Auth::user()->role !== UserRole::SUPER_ADMIN) {


+ 1
- 0
routes/api.php Zobrazit soubor

@@ -16,6 +16,7 @@ use App\Util\RouteHelper;
RouteHelper::get('/me', App\Http\Controllers\Web\Auth\MeController::class);
RouteHelper::post('/login', App\Http\Controllers\Web\Auth\LoginController::class);
RouteHelper::get('/logout', App\Http\Controllers\Web\Auth\LogoutController::class);
RouteHelper::post('/change-contract', App\Http\Controllers\Web\Auth\ChangeContractController::class);

RouteHelper::get('/app-token-check', App\Http\Controllers\Web\ReceiptIssuingOrder\TokenCheckController::class);
RouteHelper::post('/receipt-issuing-order/confirm', App\Http\Controllers\Web\ReceiptIssuingOrder\ConfirmController::class);


Načítá se…
Zrušit
Uložit