diff --git a/app/Models/Feature/ContractFeature.php b/app/Models/Feature/ContractFeature.php index e60aa28..f1d1cb1 100644 --- a/app/Models/Feature/ContractFeature.php +++ b/app/Models/Feature/ContractFeature.php @@ -10,12 +10,10 @@ use LogicException; trait ContractFeature { - const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID; - public function setContract(Contract|string $contract): static { $id = is_string($contract) ? $contract : $contract->id; - data_set($this, self::COL_NAME_CONTRACT_ID, $id); + data_set($this, ColumnName::CONTRACT_ID, $id); return $this; } diff --git a/app/Models/Feature/ReceiptIssuingOrderFeature.php b/app/Models/Feature/ReceiptIssuingOrderFeature.php index 8c5761c..46c55b3 100644 --- a/app/Models/Feature/ReceiptIssuingOrderFeature.php +++ b/app/Models/Feature/ReceiptIssuingOrderFeature.php @@ -10,12 +10,10 @@ use LogicException; trait ReceiptIssuingOrderFeature { - const COL_NAME_RECEIPT_ISSUING_ORDER_ID = ColumnName::RECEIPT_ISSUING_ORDER_ID; - public function setReceiptIssuingOrder(ReceiptIssuingOrder|string $receiptIssuingOrder): static { $id = is_string($receiptIssuingOrder) ? $receiptIssuingOrder : $receiptIssuingOrder->id; - data_set($this, self::COL_NAME_RECEIPT_ISSUING_ORDER_ID, $id); + data_set($this, ColumnName::RECEIPT_ISSUING_ORDER_ID, $id); return $this; } diff --git a/app/Models/Feature/SMSProviderFeature.php b/app/Models/Feature/SMSProviderFeature.php index b625a77..8d41b5e 100644 --- a/app/Models/Feature/SMSProviderFeature.php +++ b/app/Models/Feature/SMSProviderFeature.php @@ -10,12 +10,10 @@ use LogicException; trait SMSProviderFeature { - const COL_NAME_SMS_PROVIDER_ID = ColumnName::SMS_PROVIDER_ID; - public function setSMSProvider(SMSProvider|string $smsProvider): static { $id = is_string($smsProvider) ? $smsProvider : $smsProvider->id; - data_set($this, self::COL_NAME_SMS_PROVIDER_ID, $id); + data_set($this, ColumnName::SMS_PROVIDER_ID, $id); return $this; } diff --git a/app/Models/Feature/SMSSendOrderFeature.php b/app/Models/Feature/SMSSendOrderFeature.php index 3598342..2fa13f4 100644 --- a/app/Models/Feature/SMSSendOrderFeature.php +++ b/app/Models/Feature/SMSSendOrderFeature.php @@ -10,12 +10,10 @@ use LogicException; trait SMSSendOrderFeature { - const COL_NAME_SMS_SEND_ORDER_ID = ColumnName::SMS_SEND_ORDER_ID; - public function setSMSSendOrder(SMSSendOrder|string $smsSendOrder) { $id = is_string($smsSendOrder) ? $smsSendOrder : $smsSendOrder->id; - data_set($this, self::COL_NAME_SMS_SEND_ORDER_ID, $id); + data_set($this, ColumnName::SMS_SEND_ORDER_ID, $id); } public function smsSendOrder(): BelongsTo diff --git a/app/Models/ReceiptIssuingHTParkingCustomOrder.php b/app/Models/ReceiptIssuingHTParkingCustomOrder.php index 923ad0f..09bf07b 100644 --- a/app/Models/ReceiptIssuingHTParkingCustomOrder.php +++ b/app/Models/ReceiptIssuingHTParkingCustomOrder.php @@ -8,6 +8,8 @@ class ReceiptIssuingHTParkingCustomOrder extends AppModel { use ReceiptIssuingOrderFeature; + const COL_NAME_RECEIPT_ISSUING_ORDER_ID = ColumnName::RECEIPT_ISSUING_ORDER_ID; + const COL_NAME_CUSTOMER_CODE = "customer_code"; const COL_NAME_PARKING_MANAGEMENT_CODE = "parking_management_code"; const COL_NAME_ADJUST_SEQ_NO = "adjust_seq_no"; diff --git a/app/Models/ReceiptIssuingOrder.php b/app/Models/ReceiptIssuingOrder.php index 4b32a93..6b5c4b8 100644 --- a/app/Models/ReceiptIssuingOrder.php +++ b/app/Models/ReceiptIssuingOrder.php @@ -11,6 +11,8 @@ class ReceiptIssuingOrder extends AppModel { use ContractFeature; + const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID; + const COL_NAME_HANDLER_ID = "handler_id"; const COL_NAME_ORDER_DATETIME = "order_datetime"; const COL_NAME_STATUS_NAME = "status_name"; diff --git a/app/Models/ReceiptIssuingOrderTax.php b/app/Models/ReceiptIssuingOrderTax.php index 2e235c3..949cad2 100644 --- a/app/Models/ReceiptIssuingOrderTax.php +++ b/app/Models/ReceiptIssuingOrderTax.php @@ -9,6 +9,9 @@ class ReceiptIssuingOrderTax extends AppModel { use ContractFeature, ReceiptIssuingOrderFeature; + const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID; + const COL_NAME_RECEIPT_ISSUING_ORDER_ID = ColumnName::RECEIPT_ISSUING_ORDER_ID; + const COL_NAME_TAX_RATE = "tax_rate"; const COL_NAME_TAX_AMOUNT = "tax_amount"; diff --git a/app/Models/SMSProviderFourSMessageCommunication.php b/app/Models/SMSProviderFourSMessageCommunication.php index 01e9a12..b48db2d 100644 --- a/app/Models/SMSProviderFourSMessageCommunication.php +++ b/app/Models/SMSProviderFourSMessageCommunication.php @@ -9,6 +9,9 @@ class SMSProviderFourSMessageCommunication extends AppModel { use ContractFeature, SMSSendOrderFeature; + const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID; + const COL_NAME_SMS_SEND_ORDER_ID = ColumnName::SMS_SEND_ORDER_ID; + const COL_NAME_REQUEST_ID = "request_id"; const COL_NAME_REQUEST_DATE = "request_date"; const COL_NAME_REQUEST_STATUS = "request_status"; diff --git a/app/Models/SMSSendOrder.php b/app/Models/SMSSendOrder.php index 329e5fb..84225bf 100644 --- a/app/Models/SMSSendOrder.php +++ b/app/Models/SMSSendOrder.php @@ -12,6 +12,10 @@ class SMSSendOrder extends AppModel { use ContractFeature, ReceiptIssuingOrderFeature, SMSProviderFeature; + const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID; + const COL_NAME_RECEIPT_ISSUING_ORDER_ID = ColumnName::RECEIPT_ISSUING_ORDER_ID; + const COL_NAME_SMS_PROVIDER_ID = ColumnName::SMS_PROVIDER_ID; + const COL_NAME_DONE = 'done'; const COL_NAME_PORPOSE = 'purpose'; diff --git a/app/Models/UseByKeySummary.php b/app/Models/UseByKeySummary.php index 020696a..892a944 100644 --- a/app/Models/UseByKeySummary.php +++ b/app/Models/UseByKeySummary.php @@ -8,6 +8,8 @@ class UseByKeySummary extends AppModel { use ContractFeature; + const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID; + const COL_NAME_SUMMARY_YYYYMM = 'summary_yyyymm'; const COL_NAME_SUMMARY_KEY1 = "summary_key1"; const COL_NAME_SUMMARY_KEY2 = "summary_key2"; diff --git a/app/Models/UseSummary.php b/app/Models/UseSummary.php index 160d3e0..a16234d 100644 --- a/app/Models/UseSummary.php +++ b/app/Models/UseSummary.php @@ -8,6 +8,8 @@ class UseSummary extends AppModel { use ContractFeature; + const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID; + const COL_NAME_SUMMARY_YYYYMM = 'summary_yyyymm'; const COL_NAME_RECEIPT_ORDER_COUNT = 'receipt_order_count'; const COL_NAME_SMS_SEND_COUNT = 'sms_send_count'; diff --git a/app/Models/User.php b/app/Models/User.php index 29c4af5..e8d199b 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -27,6 +27,8 @@ class User extends Authenticatable implements IModelFeature const COL_NAME_NAME = 'name'; const COL_NAME_PASSWORD = 'password'; + const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID; + const COL_NAME_CREATED_BY = ColumnName::CREATED_BY; const COL_NAME_UPDATED_BY = ColumnName::UPDATED_BY; const COL_NAME_CREATED_AT = ColumnName::CREATED_AT;