From 47f4267fce60038039fac8514234fa1ca2dde3e2 Mon Sep 17 00:00:00 2001 From: "choi.jh" Date: Wed, 18 Jun 2025 13:31:28 +0900 Subject: [PATCH] dbms_init...1 --- app/Config/Routes.php | 4 +- app/Controllers/CLI/Payment.php | 77 +++++++++++++++++++ app/Database/dbms_init_all.sql | 10 +-- app/Services/CommonService.php | 15 ++-- app/Services/Customer/AccountService.php | 5 +- app/Services/Customer/ClientService.php | 6 +- app/Services/Customer/CouponService.php | 5 +- app/Services/Customer/CustomerService.php | 3 +- app/Services/Customer/PointService.php | 5 +- .../Customer/ServiceHistoryService.php | 4 +- .../ServiceItemLinkIpService.php | 4 +- .../ServiceItemLinkService.php | 4 +- app/Services/Customer/ServiceItemService.php | 4 +- .../Customer/ServicePaymentService.php | 5 +- app/Services/Customer/ServiceService.php | 10 +-- app/Services/Equipment/CodeService.php | 4 +- app/Services/Equipment/DomainService.php | 4 +- app/Services/Equipment/EquipmentService.php | 3 +- app/Services/Equipment/Part/CpuService.php | 4 +- .../Equipment/Part/DefenceService.php | 4 +- app/Services/Equipment/Part/IpService.php | 4 +- app/Services/Equipment/Part/LineService.php | 4 +- app/Services/Equipment/Part/PartService.php | 3 +- app/Services/Equipment/Part/RamService.php | 4 +- .../Equipment/Part/SoftwareService.php | 4 +- .../Equipment/Part/StorageService.php | 4 +- app/Services/Equipment/ServerService.php | 4 +- app/Services/MyLogService.php | 3 +- app/Services/UserSNSService.php | 6 +- app/Services/UserService.php | 4 +- app/Views/admin/payment/invoice.php | 2 +- 31 files changed, 123 insertions(+), 99 deletions(-) create mode 100644 app/Controllers/CLI/Payment.php diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 0d8d60f..7c41db7 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -11,7 +11,9 @@ $routes->addPlaceholder('uuid', '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4} //authFilter는 추가적인 작업이 필요 //1. app/Filters/AuthFilter.php //2. Config/Filters.php -> $aliases = ['authFilter' => AuthFilter::class] -$routes->group('cli', ['namespace' => 'App\Controllers\CLI'], function ($routes) {}); +$routes->group('cli', ['namespace' => 'App\Controllers\CLI'], function ($routes) { + $routes->cli('billing', 'Payment::billing'); +}); $routes->group('', ['namespace' => 'App\Controllers'], function ($routes) { $routes->get('/', 'Home::index'); $routes->group('auth', ['namespace' => 'App\Controllers\Auth'], function ($routes) { diff --git a/app/Controllers/CLI/Payment.php b/app/Controllers/CLI/Payment.php new file mode 100644 index 0000000..da45874 --- /dev/null +++ b/app/Controllers/CLI/Payment.php @@ -0,0 +1,77 @@ +_db = \Config\Database::connect(); + } + public function getServiceService(): ServiceService + { + if (!$this->_serviceService) { + $this->_serviceService = new ServiceService($this->request); + } + return $this->_serviceService; + } + public function getServiceItemService(): ServiceItemService + { + if (!$this->_servicItemeService) { + $this->_servicItemeService = new ServiceItemService($this->request); + } + return $this->_servicItemeService; + } + public function getServicePaymentService(): ServicePaymentService + { + if (!$this->_servicePaymentService) { + $this->_servicePaymentService = new ServicePaymentService($this->request); + } + return $this->_servicePaymentService; + } + public function billing(): void + { + //Transaction Start + $this->getServiceService()->getModel()->transStart(); + try { + //서비스중인 서버중 결제일이 오늘인 서비스 확인 + //결제일이 오늘이 서비스를 모두 연장처리 + $this->getServiceService()->extendBillingAt(date('Y-m-d'), DEFAULTS['STATUS']); + //결제일이 오늘보다 큰 서비스가져오기 + foreach ($this->getServiceService()->getEntities(['billing_at >' => date("Y-m-d")]) as $serviceEntity) { + echo $serviceEntity->getPK() . ":" . $serviceEntity->getBillingAt() . "\n"; + foreach ($this->getServiceItemService()->getEntities(['serviceinfo_uid' => $serviceEntity->getPK()]) as $itemEntity) { + if ($itemEntity->getBillingCycle() == "month") { + //결제정보 ServicePaymentService에 신규등록 + $this->getServicePaymentService()->createPaymentByServiceItem($itemEntity); + } + } + } + // echo $this->getServiceService()->getModel()->getLastQuery() . "\n"; + log_message("notice", "Billing 작업을 완료하였습니다."); + $this->getServiceService()->getModel()->transCommit(); + } catch (\Exception $e) { + //Transaction Rollback + $this->getServiceService()->getModel()->transRollback(); + log_message( + "error", + "Billing 작업을 실패하였습니다.\n--------------\n" . + $e->getMessage() . + "\n--------------\n" + ); + } + } +} diff --git a/app/Database/dbms_init_all.sql b/app/Database/dbms_init_all.sql index 8563438..1450477 100644 --- a/app/Database/dbms_init_all.sql +++ b/app/Database/dbms_init_all.sql @@ -34,7 +34,7 @@ CREATE TABLE `accountinfo` ( PRIMARY KEY (`uid`), KEY `FK_clientinfo_TO_accountinfo` (`clientinfo_uid`), CONSTRAINT `FK_clientinfo_TO_accountinfo` FOREIGN KEY (`clientinfo_uid`) REFERENCES `clientinfo` (`uid`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='예치금계좌'; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='예치금계좌'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -43,7 +43,7 @@ CREATE TABLE `accountinfo` ( LOCK TABLES `accountinfo` WRITE; /*!40000 ALTER TABLE `accountinfo` DISABLE KEYS */; -INSERT INTO `accountinfo` VALUES (1,1,'5월예치금입금','Test111',100000,'default',NULL,'2025-05-29 06:08:43'),(2,1,'5월예치금출금','Test111',50000,'out',NULL,'2025-05-29 06:09:07'); +INSERT INTO `accountinfo` VALUES (1,1,'5월예치금입금','Test111',100000,'default','2025-06-17 02:09:08','2025-05-29 06:08:43'),(2,1,'5월예치금출금','Test111',50000,'out','2025-06-17 02:08:21','2025-05-29 06:09:07'),(3,3,'테스트입금333','Test333',100000,'default',NULL,'2025-06-17 02:11:41'); /*!40000 ALTER TABLE `accountinfo` ENABLE KEYS */; UNLOCK TABLES; @@ -76,7 +76,7 @@ CREATE TABLE `clientinfo` ( LOCK TABLES `clientinfo` WRITE; /*!40000 ALTER TABLE `clientinfo` DISABLE KEYS */; -INSERT INTO `clientinfo` VALUES (1,'user','Test111','1111','test111@co.kr',50000,0,0,'default','2025-05-29 06:09:07','2025-05-29 06:07:37'),(2,'user,vip','Test222','222','test222@co.kr',0,50,0,'default','2025-05-29 06:10:10','2025-05-29 06:07:54'),(3,'user,vip,reseller','Test333','3333','test333@co.kr',0,0,50000,'default','2025-05-29 06:10:55','2025-05-29 06:08:07'),(4,'user','Test444','4444','test444@co.kr',0,0,0,'default','2025-06-09 07:38:48','2025-05-29 06:08:17'); +INSERT INTO `clientinfo` VALUES (1,'user','Test111','1111','test111@co.kr',50000,0,0,'default','2025-05-29 06:09:07','2025-05-29 06:07:37'),(2,'user,vip','Test222','222','test222@co.kr',0,50,0,'default','2025-05-29 06:10:10','2025-05-29 06:07:54'),(3,'user,vip,reseller','Test333','3333','test333@co.kr',100000,0,50000,'default','2025-06-17 02:11:41','2025-05-29 06:08:07'),(4,'user','Test444','4444','test444@co.kr',0,0,0,'default','2025-06-09 07:38:48','2025-05-29 06:08:17'); /*!40000 ALTER TABLE `clientinfo` ENABLE KEYS */; UNLOCK TABLES; @@ -634,7 +634,7 @@ CREATE TABLE `serviceinfo_payment` ( KEY `FK_clientinfo_TO_serviceinfo_payment` (`ownerinfo_uid`), CONSTRAINT `FK_clientinfo_TO_serviceinfo_payment` FOREIGN KEY (`ownerinfo_uid`) REFERENCES `clientinfo` (`uid`), CONSTRAINT `FK_serviceinfo_TO_serviceinfo_payment` FOREIGN KEY (`serviceinfo_uid`) REFERENCES `serviceinfo` (`uid`) -) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COMMENT='결제정보'; +) ENGINE=InnoDB AUTO_INCREMENT=48 DEFAULT CHARSET=utf8 COMMENT='결제정보'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -748,4 +748,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-06-17 11:04:42 +-- Dump completed on 2025-06-18 13:10:28 diff --git a/app/Services/CommonService.php b/app/Services/CommonService.php index 7643c7a..6fe3c42 100644 --- a/app/Services/CommonService.php +++ b/app/Services/CommonService.php @@ -2,7 +2,6 @@ namespace App\Services; -use CodeIgniter\HTTP\IncomingRequest; use App\Libraries\LogCollector; abstract class CommonService @@ -10,16 +9,20 @@ abstract class CommonService private $_serviceDatas = []; private $_model = null; private $_classNames = []; - protected ?IncomingRequest $request = null; - protected function __construct(?IncomingRequest $_request = null) + private $_request = null; + protected function __construct(mixed $_request = null) { - $this->request = $_request; + $this->_request = $_request; } abstract public function getModelClass(): mixed; abstract public function getEntityClass(): mixed; abstract public function getFormFields(): array; abstract public function getFilterFields(): array; abstract public function getBatchJobFields(): array; + final public function getRequest(): mixed + { + return $this->_request; + } public function getIndexFields(): array { return $this->getFormFields(); @@ -39,10 +42,6 @@ abstract class CommonService { $this->_serviceDatas[$name] = $value; } - final public function getRequest(): IncomingRequest|null - { - return $this->request; - } final protected function addClassName(string $className): void { $this->_classNames[] = $className; diff --git a/app/Services/Customer/AccountService.php b/app/Services/Customer/AccountService.php index 94d73a4..fcb7f23 100644 --- a/app/Services/Customer/AccountService.php +++ b/app/Services/Customer/AccountService.php @@ -4,14 +4,11 @@ namespace App\Services\Customer; use App\Entities\Customer\AccountEntity; use App\Models\Customer\AccountModel; -use CodeIgniter\HTTP\IncomingRequest; - use App\Entities\Customer\ClientEntity; class AccountService extends CustomerService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Account'); diff --git a/app/Services/Customer/ClientService.php b/app/Services/Customer/ClientService.php index 5fcdb38..cd2335a 100644 --- a/app/Services/Customer/ClientService.php +++ b/app/Services/Customer/ClientService.php @@ -2,16 +2,12 @@ namespace App\Services\Customer; -use CodeIgniter\HTTP\IncomingRequest; - use App\Entities\Customer\ClientEntity; use App\Models\Customer\ClientModel; class ClientService extends CustomerService { - - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Client'); diff --git a/app/Services/Customer/CouponService.php b/app/Services/Customer/CouponService.php index a86206e..a6ade47 100644 --- a/app/Services/Customer/CouponService.php +++ b/app/Services/Customer/CouponService.php @@ -4,14 +4,11 @@ namespace App\Services\Customer; use App\Entities\Customer\CouponEntity; use App\Models\Customer\CouponModel; -use CodeIgniter\HTTP\IncomingRequest; - use App\Entities\Customer\ClientEntity; class CouponService extends CustomerService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Coupon'); diff --git a/app/Services/Customer/CustomerService.php b/app/Services/Customer/CustomerService.php index 90dc9c9..9e64141 100644 --- a/app/Services/Customer/CustomerService.php +++ b/app/Services/Customer/CustomerService.php @@ -16,13 +16,12 @@ use App\Services\Equipment\Part\LineService; use App\Services\Equipment\Part\RamService; use App\Services\Equipment\Part\SoftwareService; use App\Services\Equipment\Part\StorageService; -use CodeIgniter\HTTP\IncomingRequest; abstract class CustomerService extends CommonService { private ?ClientService $_clientService = null; private $_equipmentService = []; - protected function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Customer'); diff --git a/app/Services/Customer/PointService.php b/app/Services/Customer/PointService.php index dd49cf0..167ef6d 100644 --- a/app/Services/Customer/PointService.php +++ b/app/Services/Customer/PointService.php @@ -4,14 +4,11 @@ namespace App\Services\Customer; use App\Entities\Customer\PointEntity; use App\Models\Customer\PointModel; -use CodeIgniter\HTTP\IncomingRequest; - use App\Entities\Customer\ClientEntity; class PointService extends CustomerService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Point'); diff --git a/app/Services/Customer/ServiceHistoryService.php b/app/Services/Customer/ServiceHistoryService.php index 9647dbb..d49be8c 100644 --- a/app/Services/Customer/ServiceHistoryService.php +++ b/app/Services/Customer/ServiceHistoryService.php @@ -5,13 +5,11 @@ namespace App\Services\Customer; use App\Entities\Customer\ServiceHistoryEntity; use App\Models\Customer\ServiceHistoryModel; use App\Services\Customer\ServiceService; -use CodeIgniter\HTTP\IncomingRequest; class ServiceHistoryService extends CustomerService { - protected ?IncomingRequest $request = null; private ?ServiceService $_serviceService = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('ServiceHistory'); diff --git a/app/Services/Customer/ServiceItemLink/ServiceItemLinkIpService.php b/app/Services/Customer/ServiceItemLink/ServiceItemLinkIpService.php index 043385b..6ce1942 100644 --- a/app/Services/Customer/ServiceItemLink/ServiceItemLinkIpService.php +++ b/app/Services/Customer/ServiceItemLink/ServiceItemLinkIpService.php @@ -5,13 +5,11 @@ namespace App\Services\Customer\ServiceItemLink; use App\Entities\Customer\ServiceItemEntity; use App\Entities\Equipment\Part\IpEntity; use App\Services\Equipment\Part\IpService; -use CodeIgniter\HTTP\IncomingRequest; class ServiceItemLinkIpService extends ServiceItemLinkService { - protected ?IncomingRequest $request = null; private ?IpService $_ipService = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); } diff --git a/app/Services/Customer/ServiceItemLink/ServiceItemLinkService.php b/app/Services/Customer/ServiceItemLink/ServiceItemLinkService.php index c2d8438..1b5afce 100644 --- a/app/Services/Customer/ServiceItemLink/ServiceItemLinkService.php +++ b/app/Services/Customer/ServiceItemLink/ServiceItemLinkService.php @@ -3,12 +3,10 @@ namespace App\Services\Customer\ServiceItemLink; use App\Services\Customer\ServiceItemService; -use CodeIgniter\HTTP\IncomingRequest; abstract class ServiceItemLinkService extends ServiceItemService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); } diff --git a/app/Services/Customer/ServiceItemService.php b/app/Services/Customer/ServiceItemService.php index 9fbe83b..ad6ff80 100644 --- a/app/Services/Customer/ServiceItemService.php +++ b/app/Services/Customer/ServiceItemService.php @@ -7,13 +7,11 @@ use App\Models\Customer\ServiceItemModel; use App\Services\Customer\CustomerService; use App\Services\Customer\ServicePaymentService; use App\Services\Customer\ServiceService; -use CodeIgniter\HTTP\IncomingRequest; class ServiceItemService extends CustomerService { - protected ?IncomingRequest $request = null; private ?ServiceService $_serviceService = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('ServiceItem'); diff --git a/app/Services/Customer/ServicePaymentService.php b/app/Services/Customer/ServicePaymentService.php index 8799d15..647f7fa 100644 --- a/app/Services/Customer/ServicePaymentService.php +++ b/app/Services/Customer/ServicePaymentService.php @@ -2,8 +2,6 @@ namespace App\Services\Customer; -use CodeIgniter\HTTP\IncomingRequest; - use App\Entities\Customer\ServiceItemEntity; use App\Entities\Customer\ServicePaymentEntity; use App\Models\Customer\ServicePaymentModel; @@ -11,9 +9,8 @@ use App\Services\Customer\ServiceService; class ServicePaymentService extends CustomerService { - protected ?IncomingRequest $request = null; private ?ServiceService $_serviceService = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('ServicePayment'); diff --git a/app/Services/Customer/ServiceService.php b/app/Services/Customer/ServiceService.php index 03bc81b..c035cf8 100644 --- a/app/Services/Customer/ServiceService.php +++ b/app/Services/Customer/ServiceService.php @@ -7,14 +7,12 @@ use App\Entities\Equipment\CodeEntity; use App\Models\Customer\ServiceModel; use App\Services\Equipment\CodeService; -use CodeIgniter\HTTP\IncomingRequest; class ServiceService extends CustomerService { - protected ?IncomingRequest $request = null; private ?CodeService $_codeService = null; private ?string $_searchIP = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Service'); @@ -93,14 +91,14 @@ class ServiceService extends CustomerService //기본 기능부분 //다음 달로 결제일을 연장합니다. - public function extendBillingAt(ServiceEntity $entity): bool + final public function extendBillingAt(string $billing_at, string $status): bool { $sql = "UPDATE serviceinfo SET billing_at = IF(DAY(billing_at) > DAY(LAST_DAY(billing_at)), LAST_DAY(DATE_ADD(billing_at, INTERVAL 1 MONTH)), DATE_ADD(billing_at, INTERVAL 1 MONTH) - ) WHERE uid = ?"; - return $this->getModel()->query($sql, [$entity->getPK()]); + ) WHERE billing_at = ? AND status = ?"; + return $this->getModel()->query($sql, [$billing_at, $status]); } public function create(array $formDatas, mixed $entity = null): ServiceEntity { diff --git a/app/Services/Equipment/CodeService.php b/app/Services/Equipment/CodeService.php index 131cf77..8158e77 100644 --- a/app/Services/Equipment/CodeService.php +++ b/app/Services/Equipment/CodeService.php @@ -4,13 +4,11 @@ namespace App\Services\Equipment; use App\Entities\Equipment\CodeEntity; use App\Models\Equipment\CodeModel; -use CodeIgniter\HTTP\IncomingRequest; use App\Services\Equipment\EquipmentService; class CodeService extends EquipmentService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Code'); diff --git a/app/Services/Equipment/DomainService.php b/app/Services/Equipment/DomainService.php index 20ec833..39b059c 100644 --- a/app/Services/Equipment/DomainService.php +++ b/app/Services/Equipment/DomainService.php @@ -4,12 +4,10 @@ namespace App\Services\Equipment; use App\Entities\Equipment\DomainEntity; use App\Models\Equipment\DomainModel; -use CodeIgniter\HTTP\IncomingRequest; class DomainService extends EquipmentService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Domain'); diff --git a/app/Services/Equipment/EquipmentService.php b/app/Services/Equipment/EquipmentService.php index 6987f13..4d8ec17 100644 --- a/app/Services/Equipment/EquipmentService.php +++ b/app/Services/Equipment/EquipmentService.php @@ -3,11 +3,10 @@ namespace App\Services\Equipment; use App\Services\CommonService; -use CodeIgniter\HTTP\IncomingRequest; abstract class EquipmentService extends CommonService { - protected function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Equipment'); diff --git a/app/Services/Equipment/Part/CpuService.php b/app/Services/Equipment/Part/CpuService.php index 173b72a..6eb2523 100644 --- a/app/Services/Equipment/Part/CpuService.php +++ b/app/Services/Equipment/Part/CpuService.php @@ -4,12 +4,10 @@ namespace App\Services\Equipment\Part; use App\Entities\Equipment\Part\CpuEntity; use App\Models\Equipment\Part\CpuModel; -use CodeIgniter\HTTP\IncomingRequest; class CpuService extends PartService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Cpu'); diff --git a/app/Services/Equipment/Part/DefenceService.php b/app/Services/Equipment/Part/DefenceService.php index 281083c..9935902 100644 --- a/app/Services/Equipment/Part/DefenceService.php +++ b/app/Services/Equipment/Part/DefenceService.php @@ -4,12 +4,10 @@ namespace App\Services\Equipment\Part; use App\Entities\Equipment\Part\DefenceEntity; use App\Models\Equipment\Part\DefenceModel; -use CodeIgniter\HTTP\IncomingRequest; class DefenceService extends PartService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Defence'); diff --git a/app/Services/Equipment/Part/IpService.php b/app/Services/Equipment/Part/IpService.php index f8625f4..6ac1e28 100644 --- a/app/Services/Equipment/Part/IpService.php +++ b/app/Services/Equipment/Part/IpService.php @@ -5,12 +5,10 @@ namespace App\Services\Equipment\Part; use App\Entities\Equipment\Part\IpEntity; use App\Entities\Equipment\Part\LineEntity; use App\Models\Equipment\Part\IpModel; -use CodeIgniter\HTTP\IncomingRequest; class IpService extends PartService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Ip'); diff --git a/app/Services/Equipment/Part/LineService.php b/app/Services/Equipment/Part/LineService.php index 846385a..fb5063d 100644 --- a/app/Services/Equipment/Part/LineService.php +++ b/app/Services/Equipment/Part/LineService.php @@ -4,12 +4,10 @@ namespace App\Services\Equipment\Part; use App\Entities\Equipment\Part\LineEntity; use App\Models\Equipment\Part\LineModel; -use CodeIgniter\HTTP\IncomingRequest; class LineService extends PartService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Line'); diff --git a/app/Services/Equipment/Part/PartService.php b/app/Services/Equipment/Part/PartService.php index bb8234c..c5e60de 100644 --- a/app/Services/Equipment/Part/PartService.php +++ b/app/Services/Equipment/Part/PartService.php @@ -3,11 +3,10 @@ namespace App\Services\Equipment\Part; use App\Services\Equipment\EquipmentService; -use CodeIgniter\HTTP\IncomingRequest; abstract class PartService extends EquipmentService { - protected function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Part'); diff --git a/app/Services/Equipment/Part/RamService.php b/app/Services/Equipment/Part/RamService.php index c7fe303..711c1d6 100644 --- a/app/Services/Equipment/Part/RamService.php +++ b/app/Services/Equipment/Part/RamService.php @@ -4,12 +4,10 @@ namespace App\Services\Equipment\Part; use App\Entities\Equipment\Part\RamEntity; use App\Models\Equipment\Part\RamModel; -use CodeIgniter\HTTP\IncomingRequest; class RamService extends PartService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Ram'); diff --git a/app/Services/Equipment/Part/SoftwareService.php b/app/Services/Equipment/Part/SoftwareService.php index 6b5a96a..02f04b3 100644 --- a/app/Services/Equipment/Part/SoftwareService.php +++ b/app/Services/Equipment/Part/SoftwareService.php @@ -4,12 +4,10 @@ namespace App\Services\Equipment\Part; use App\Entities\Equipment\Part\SoftwareEntity; use App\Models\Equipment\Part\SoftwareModel; -use CodeIgniter\HTTP\IncomingRequest; class SoftwareService extends PartService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Software'); diff --git a/app/Services/Equipment/Part/StorageService.php b/app/Services/Equipment/Part/StorageService.php index d4b5ca8..d772945 100644 --- a/app/Services/Equipment/Part/StorageService.php +++ b/app/Services/Equipment/Part/StorageService.php @@ -4,12 +4,10 @@ namespace App\Services\Equipment\Part; use App\Entities\Equipment\Part\StorageEntity; use App\Models\Equipment\Part\StorageModel; -use CodeIgniter\HTTP\IncomingRequest; class StorageService extends PartService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Storage'); diff --git a/app/Services/Equipment/ServerService.php b/app/Services/Equipment/ServerService.php index aee19e9..a46d55c 100644 --- a/app/Services/Equipment/ServerService.php +++ b/app/Services/Equipment/ServerService.php @@ -4,13 +4,11 @@ namespace App\Services\Equipment; use App\Entities\Equipment\ServerEntity; use App\Models\Equipment\ServerModel; -use CodeIgniter\HTTP\IncomingRequest; use App\Services\Equipment\EquipmentService; class ServerService extends EquipmentService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('Server'); diff --git a/app/Services/MyLogService.php b/app/Services/MyLogService.php index d56be76..bec7b44 100644 --- a/app/Services/MyLogService.php +++ b/app/Services/MyLogService.php @@ -5,12 +5,11 @@ namespace App\Services; use App\Entities\MyLogEntity; use App\Models\MyLogModel; use App\Services\Auth\AuthService; -use CodeIgniter\HTTP\IncomingRequest; use App\Libraries\LogCollector; class MyLogService extends CommonService { - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('MyLog'); diff --git a/app/Services/UserSNSService.php b/app/Services/UserSNSService.php index fb9760b..ced98e1 100644 --- a/app/Services/UserSNSService.php +++ b/app/Services/UserSNSService.php @@ -4,15 +4,13 @@ namespace App\Services; use App\Models\UserSNSModel; use App\Entities\UserSNSEntity; -use CodeIgniter\HTTP\IncomingRequest; // use Google\Service\AndroidEnterprise\Resource\Users; class UserSNSService extends CommonService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { - parent::__construct($request); + parent::__construct($request);; $this->addClassName('UserSNS'); } public function getModelClass(): UserSNSModel diff --git a/app/Services/UserService.php b/app/Services/UserService.php index 445356b..97a76c5 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -4,12 +4,10 @@ namespace App\Services; use App\Entities\UserEntity; use App\Models\UserModel; -use CodeIgniter\HTTP\IncomingRequest; class UserService extends CommonService { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct(mixed $request = null) { parent::__construct($request); $this->addClassName('User'); diff --git a/app/Views/admin/payment/invoice.php b/app/Views/admin/payment/invoice.php index b5e8c20..f6ce3d0 100644 --- a/app/Views/admin/payment/invoice.php +++ b/app/Views/admin/payment/invoice.php @@ -47,7 +47,7 @@
-
원
+
원