diff --git a/app/Database/erp2_2.vuerd.json b/app/Database/erp2_2.vuerd.json index 67a23cc..fa07155 100644 --- a/app/Database/erp2_2.vuerd.json +++ b/app/Database/erp2_2.vuerd.json @@ -4,7 +4,7 @@ "settings": { "width": 3000, "height": 3000, - "scrollTop": -961.8844, + "scrollTop": -1061.8844, "scrollLeft": -401.9322, "zoomLevel": 0.79, "show": 511, @@ -755,43 +755,6 @@ "createAt": 1748484896313 } }, - "8GMPyGUFlx2Mw7BwzizfD": { - "id": "8GMPyGUFlx2Mw7BwzizfD", - "name": "invoiceinfo_items", - "comment": "청구서Item정보", - "columnIds": [ - "Tut5OwChs5GkmQRKYsuEr", - "9_e81_kuxcMWImGOVctRq", - "UKiaysyfmKre41HUJ-obR", - "njG0q182YypaWl-1ninSr", - "ZRujIEwc_vcJhiH6Cy9xu", - "ATQoMPYfRTAvln8s9PXCO", - "wWl7qvr53k4k84NQd-gnf", - "jU593xLmqs5fYkZKNrkcf" - ], - "seqColumnIds": [ - "Tut5OwChs5GkmQRKYsuEr", - "9_e81_kuxcMWImGOVctRq", - "UKiaysyfmKre41HUJ-obR", - "njG0q182YypaWl-1ninSr", - "ZRujIEwc_vcJhiH6Cy9xu", - "ATQoMPYfRTAvln8s9PXCO", - "wWl7qvr53k4k84NQd-gnf", - "jU593xLmqs5fYkZKNrkcf" - ], - "ui": { - "x": 129.4909, - "y": 622.768, - "zIndex": 2386, - "widthName": 93, - "widthComment": 86, - "color": "" - }, - "meta": { - "updateAt": 1748508755031, - "createAt": 1748485501041 - } - }, "B8haiEbPc1lRBWTv1g25G": { "id": "B8haiEbPc1lRBWTv1g25G", "name": "serviceinfo", @@ -5567,126 +5530,6 @@ "createAt": 1748485808994 } }, - "Tut5OwChs5GkmQRKYsuEr": { - "id": "Tut5OwChs5GkmQRKYsuEr", - "tableId": "8GMPyGUFlx2Mw7BwzizfD", - "name": "uid", - "comment": "", - "dataType": "INT", - "default": "", - "options": 11, - "ui": { - "keys": 1, - "widthName": 60, - "widthComment": 60, - "widthDataType": 60, - "widthDefault": 60 - }, - "meta": { - "updateAt": 1748485893765, - "createAt": 1748485890398 - } - }, - "UKiaysyfmKre41HUJ-obR": { - "id": "UKiaysyfmKre41HUJ-obR", - "tableId": "8GMPyGUFlx2Mw7BwzizfD", - "name": "item_type", - "comment": "", - "dataType": "VARCHAR(20)", - "default": "", - "options": 8, - "ui": { - "keys": 0, - "widthName": 60, - "widthComment": 60, - "widthDataType": 75, - "widthDefault": 60 - }, - "meta": { - "updateAt": 1748831128581, - "createAt": 1748485890398 - } - }, - "njG0q182YypaWl-1ninSr": { - "id": "njG0q182YypaWl-1ninSr", - "tableId": "8GMPyGUFlx2Mw7BwzizfD", - "name": "item_uid", - "comment": "", - "dataType": "INT", - "default": "", - "options": 8, - "ui": { - "keys": 0, - "widthName": 60, - "widthComment": 60, - "widthDataType": 60, - "widthDefault": 60 - }, - "meta": { - "updateAt": 1748485890398, - "createAt": 1748485890398 - } - }, - "wWl7qvr53k4k84NQd-gnf": { - "id": "wWl7qvr53k4k84NQd-gnf", - "tableId": "8GMPyGUFlx2Mw7BwzizfD", - "name": "updated_at", - "comment": "", - "dataType": "TIMESTAMP", - "default": "", - "options": 0, - "ui": { - "keys": 0, - "widthName": 62, - "widthComment": 60, - "widthDataType": 65, - "widthDefault": 60 - }, - "meta": { - "updateAt": 1748485890399, - "createAt": 1748485890398 - } - }, - "jU593xLmqs5fYkZKNrkcf": { - "id": "jU593xLmqs5fYkZKNrkcf", - "tableId": "8GMPyGUFlx2Mw7BwzizfD", - "name": "created_at", - "comment": "", - "dataType": "TIMESTAMP", - "default": "CURRENT_TIMESTAMP", - "options": 8, - "ui": { - "keys": 0, - "widthName": 60, - "widthComment": 60, - "widthDataType": 65, - "widthDefault": 122 - }, - "meta": { - "updateAt": 1748485890399, - "createAt": 1748485890399 - } - }, - "9_e81_kuxcMWImGOVctRq": { - "id": "9_e81_kuxcMWImGOVctRq", - "tableId": "8GMPyGUFlx2Mw7BwzizfD", - "name": "invoiceinfo_uid", - "comment": "", - "dataType": "INT", - "default": "", - "options": 8, - "ui": { - "keys": 0, - "widthName": 81, - "widthComment": 60, - "widthDataType": 60, - "widthDefault": 60 - }, - "meta": { - "updateAt": 1748485943562, - "createAt": 1748485906874 - } - }, "uqclfL7uJmobFac6Wtr4M": { "id": "uqclfL7uJmobFac6Wtr4M", "tableId": "B8haiEbPc1lRBWTv1g25G", @@ -5787,26 +5630,6 @@ "createAt": 1748486421395 } }, - "ATQoMPYfRTAvln8s9PXCO": { - "id": "ATQoMPYfRTAvln8s9PXCO", - "tableId": "8GMPyGUFlx2Mw7BwzizfD", - "name": "amount", - "comment": "청구금액", - "dataType": "INT", - "default": "0", - "options": 8, - "ui": { - "keys": 0, - "widthName": 60, - "widthComment": 60, - "widthDataType": 60, - "widthDefault": 60 - }, - "meta": { - "updateAt": 1748487010519, - "createAt": 1748486998476 - } - }, "bkFCshlGApXD4wNeEKiJp": { "id": "bkFCshlGApXD4wNeEKiJp", "tableId": "doERb3lIVeBW_D0NtNYX8", @@ -5847,26 +5670,6 @@ "createAt": 1748489670367 } }, - "ZRujIEwc_vcJhiH6Cy9xu": { - "id": "ZRujIEwc_vcJhiH6Cy9xu", - "tableId": "8GMPyGUFlx2Mw7BwzizfD", - "name": "billing_cyle", - "comment": "", - "dataType": "VARCHAR(20)", - "default": "", - "options": 8, - "ui": { - "keys": 0, - "widthName": 60, - "widthComment": 60, - "widthDataType": 75, - "widthDefault": 60 - }, - "meta": { - "updateAt": 1748831135978, - "createAt": 1748505749343 - } - }, "YMx_XwTS1PatRlZtoxW8Z": { "id": "YMx_XwTS1PatRlZtoxW8Z", "tableId": "isiA_oaJNIm3F4nYJuLJ1", @@ -7197,90 +7000,6 @@ "createAt": 1748478977657 } }, - "w-QYHsd8nVKvDaBO9LDbp": { - "id": "w-QYHsd8nVKvDaBO9LDbp", - "identification": false, - "relationshipType": 16, - "startRelationshipType": 2, - "start": { - "tableId": "6ajvOCaGuXU9pzV0Y9jEi", - "columnIds": [ - "_AcWUYKzNJd-V0fRHq8Cx" - ], - "x": 1615.2084, - "y": 757.4081333333332, - "direction": 1 - }, - "end": { - "tableId": "QCNA57Pi6A9dJDgybxS5v", - "columnIds": [ - "2Re7GlIDs1MKhwQ1n_5Ty" - ], - "x": 1439.4198999999999, - "y": 714.1919, - "direction": 2 - }, - "meta": { - "updateAt": 1748485358690, - "createAt": 1748485358690 - } - }, - "19PCL5s4M6NxuV-ePUz50": { - "id": "19PCL5s4M6NxuV-ePUz50", - "identification": false, - "relationshipType": 16, - "startRelationshipType": 2, - "start": { - "tableId": "QCNA57Pi6A9dJDgybxS5v", - "columnIds": [ - "GMPyqxaroK2OjQZnoCRwn" - ], - "x": 918.841, - "y": 693.9814, - "direction": 1 - }, - "end": { - "tableId": "8GMPyGUFlx2Mw7BwzizfD", - "columnIds": [ - "9_e81_kuxcMWImGOVctRq" - ], - "x": 645.4909, - "y": 746.768, - "direction": 2 - }, - "meta": { - "updateAt": 1748485906874, - "createAt": 1748485906874 - } - }, - "6Gx9n7rUrSbXGbvE39xnm": { - "id": "6Gx9n7rUrSbXGbvE39xnm", - "identification": false, - "relationshipType": 16, - "startRelationshipType": 2, - "start": { - "tableId": "QCNA57Pi6A9dJDgybxS5v", - "columnIds": [ - "GMPyqxaroK2OjQZnoCRwn" - ], - "x": 399.7092, - "y": 773.9289, - "direction": 4 - }, - "end": { - "tableId": "isiA_oaJNIm3F4nYJuLJ1", - "columnIds": [ - "1tE_0qGYDjR3udy5-odYS" - ], - "x": 556.4204, - "y": 707.3278, - "direction": 1 - }, - "meta": { - "updateAt": 1748506047447, - "createAt": 1748506047447 - } - }, "anhMCXytE7rcE_drKBPWz": { "id": "anhMCXytE7rcE_drKBPWz", "identification": false, diff --git a/app/Services/Customer/AccountService.php b/app/Services/Customer/AccountService.php index 757cc4d..89b98f0 100644 --- a/app/Services/Customer/AccountService.php +++ b/app/Services/Customer/AccountService.php @@ -61,6 +61,6 @@ class AccountService extends CustomerService public function create(array $formDatas, mixed $entity = null): AccountEntity { $this->setBalance($formDatas); - return parent::create($entity, $formDatas); + return parent::create($formDatas, $entity); } } diff --git a/app/Services/Customer/CouponService.php b/app/Services/Customer/CouponService.php index c8a242d..393f986 100644 --- a/app/Services/Customer/CouponService.php +++ b/app/Services/Customer/CouponService.php @@ -60,6 +60,6 @@ class CouponService extends CustomerService public function create(array $formDatas, mixed $entity = null): CouponEntity { $this->setBalance($formDatas); - return parent::create($entity, $formDatas); + return parent::create($formDatas, $entity); } } diff --git a/app/Services/Customer/PointService.php b/app/Services/Customer/PointService.php index 4e4fd4e..0d43187 100644 --- a/app/Services/Customer/PointService.php +++ b/app/Services/Customer/PointService.php @@ -59,6 +59,6 @@ class PointService extends CustomerService public function create(array $formDatas, mixed $entity = null): PointEntity { $this->setBalance($formDatas); - return parent::create($entity, $formDatas); + return parent::create($formDatas, $entity); } } diff --git a/app/Services/Customer/ServiceService.php b/app/Services/Customer/ServiceService.php index 53d692c..553fb97 100644 --- a/app/Services/Customer/ServiceService.php +++ b/app/Services/Customer/ServiceService.php @@ -67,7 +67,7 @@ class ServiceService extends CustomerService { //code의 경우 서비스중으로 설정작업 $this->getCodeService()->setStatus($formDatas['code'], CodeEntity::STATUS_OCCUPIED); - return parent::create($entity, $formDatas); + return parent::create($formDatas, $entity); } public function modify(mixed $entity, array $formDatas): ServiceEntity {