@shisyamo4131/air-guard-v2-schemas 2.3.7-dev.43 → 2.3.7-dev.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shisyamo4131/air-guard-v2-schemas",
-  "version": "2.3.7-dev.43",
+  "version": "2.3.7-dev.45",
   "description": "Schemas for AirGuard V2",
   "type": "module",
   "main": "index.js",

package/src/Agreement.js

@@ -76,11 +76,10 @@
  *****************************************************************************/
 import WorkingResult from "./WorkingResult.js";
 import {
-  VALUES as BILLING_UNIT_TYPE,
-  OPTIONS as BILLING_UNIT_TYPE_OPTIONS,
-} from "./constants/billing-unit-type.js";
+  BILLING_UNIT_TYPE_VALUES,
+  BILLING_UNIT_TYPE_OPTIONS,
+} from "./constants/index.js";
 import { defField } from "./parts/fieldDefinitions.js";
-import CutoffDate from "./utils/CutoffDate.js";
 
 const classProps = {
   ...WorkingResult.classProps,
@@ -98,7 +97,7 @@ const classProps = {
     required: true,
   }),
   billingUnitType: defField("select", {
-    default: BILLING_UNIT_TYPE.PER_DAY.value,
+    default: BILLING_UNIT_TYPE_VALUES.PER_DAY.value,
     label: "請求単位",
     required: true,
     component: {
@@ -111,23 +110,14 @@ const classProps = {
     label: "請求に休憩時間を含める",
     default: false,
   }),
-  cutoffDate: defField("select", {
-    label: "締日区分",
-    default: CutoffDate.VALUES.END_OF_MONTH,
-    required: true,
-    component: {
-      attrs: {
-        items: CutoffDate.OPTIONS,
-      },
-    },
-  }),
+  cutoffDate: defField("cutoffDate", { required: true }),
 };
 
 export default class Agreement extends WorkingResult {
   static className = "取極め";
   static classProps = classProps;
 
-  static BILLING_UNIT_TYPE = BILLING_UNIT_TYPE;
+  static BILLING_UNIT_TYPE = BILLING_UNIT_TYPE_VALUES;
 
   /**
    * Returns an object containing price-related properties.

package/src/Customer.js

@@ -9,8 +9,11 @@
 import FireModel from "@shisyamo4131/air-firebase-v2";
 import { defField } from "./parts/fieldDefinitions.js";
 import { defAccessor } from "./parts/accessorDefinitions.js";
-import { VALUES } from "./constants/contract-status.js";
 import CutoffDate from "./utils/CutoffDate.js";
+import {
+  CONTRACT_STATUS_VALUES,
+  PAYMENT_MONTH_OPTIONS,
+} from "./constants/index.js";
 
 const classProps = {
   code: defField("code", { label: "取引先コード" }),
@@ -25,27 +28,20 @@ const classProps = {
   tel: defField("tel", { colsDefinition: { cols: 12, sm: 6 } }),
   fax: defField("fax", { colsDefinition: { cols: 12, sm: 6 } }),
   contractStatus: defField("contractStatus", { required: true }),
+  cutoffDate: defField("cutoffDate", { required: true }),
   paymentMonth: defField("select", {
     default: 1,
     label: "入金サイト（月数）",
     required: true,
     component: {
       attrs: {
-        items: [
-          { title: "当月", value: 0 },
-          { title: "翌月", value: 1 },
-          { title: "翌々月", value: 2 },
-          { title: "3ヶ月後", value: 3 },
-          { title: "4ヶ月後", value: 4 },
-          { title: "5ヶ月後", value: 5 },
-          { title: "6ヶ月後", value: 6 },
-        ],
+        items: PAYMENT_MONTH_OPTIONS,
       },
     },
   }),
   paymentDate: defField("select", {
     label: "入金サイト（日付）",
-    default: CutoffDate.VALUES.END_OF_MONTH,
+    default: CutoffDate.VALUES[0].value,
     required: true,
     component: {
       attrs: {
@@ -108,9 +104,9 @@ export default class Customer extends FireModel {
     { key: "fullAddress", title: "所在地" },
   ];
 
-  static STATUS = VALUES;
-  static STATUS_ACTIVE = VALUES.ACTIVE.value;
-  static STATUS_TERMINATED = VALUES.TERMINATED.value;
+  static STATUS = CONTRACT_STATUS_VALUES;
+  static STATUS_ACTIVE = CONTRACT_STATUS_VALUES.ACTIVE.value;
+  static STATUS_TERMINATED = CONTRACT_STATUS_VALUES.TERMINATED.value;
 
   afterInitialize(item = {}) {
     super.afterInitialize(item);
@@ -139,7 +135,7 @@ export default class Customer extends FireModel {
     const finalMonth = targetMonth % 12;
 
     let dueDate;
-    if (this.paymentDate === CutoffDate.VALUES.END_OF_MONTH) {
+    if (this.paymentDate === CutoffDate.VALUES[0].value) {
       // 月末の場合
       dueDate = new Date(Date.UTC(targetYear, finalMonth + 1, 0));
     } else {

package/src/constants/index.js

@@ -35,6 +35,10 @@ export {
   VALUES as GENDER_VALUES,
   OPTIONS as GENDER_OPTIONS,
 } from "./gender.js";
+export {
+  VALUES as PAYMENT_MONTH_VALUES,
+  OPTIONS as PAYMENT_MONTH_OPTIONS,
+} from "./payment-month.js";
 export {
   VALUES as PREFECTURES_VALUES,
   OPTIONS as PREFECTURES_OPTIONS,

package/src/constants/payment-month.js

@@ -0,0 +1,21 @@
+// prettier-ignore
+
+export const VALUES = Object.freeze({
+  0: { value: 0, title: "当月" },
+  1: { value: 1, title: "翌月" },
+  2: { value: 2, title: "翌々月" },
+  3: { value: 3, title: "3ヶ月後" },
+  4: { value: 4, title: "4ヶ月後" },
+  5: { value: 5, title: "5ヶ月後" },
+  6: { value: 6, title: "6ヶ月後" },
+});
+
+export const OPTIONS = [
+  { title: VALUES[0].title, value: VALUES[0].value },
+  { title: VALUES[1].title, value: VALUES[1].value },
+  { title: VALUES[2].title, value: VALUES[2].value },
+  { title: VALUES[3].title, value: VALUES[3].value },
+  { title: VALUES[4].title, value: VALUES[4].value },
+  { title: VALUES[5].title, value: VALUES[5].value },
+  { title: VALUES[6].title, value: VALUES[6].value },
+];

package/src/parts/fieldDefinitions.js

@@ -39,6 +39,7 @@ import {
   VALUES as SITE_STATUS_VALUES,
   OPTIONS as SITE_STATUS_OPTIONS,
 } from "../constants/site-status.js";
+import CutoffDate from "../utils/CutoffDate.js";
 
 export const DEFAULT_WORKING_MINUTES = 480;
 export const DEFAULT_BREAK_MINUTES = 60;
@@ -537,6 +538,17 @@ export const fieldDefinitions = {
       },
     },
   },
+  cutoffDate: {
+    ...generalDefinitions.select,
+    default: CutoffDate.VALUES[0].value,
+    label: "締日",
+    component: {
+      name: generalDefinitions.select.component.name,
+      attrs: {
+        items: CutoffDate.OPTIONS,
+      },
+    },
+  },
   dayType: {
     ...generalDefinitions.select,
     default: DAY_TYPE_VALUES.WEEKDAY.value,

package/src/utils/CutoffDate.js

@@ -22,24 +22,24 @@ export default class CutoffDate {
    * Cutoff date constant values
    */
   static VALUES = Object.freeze({
-    DAY_5: 5,
-    DAY_10: 10,
-    DAY_15: 15,
-    DAY_20: 20,
-    DAY_25: 25,
-    END_OF_MONTH: 0,
+    5: { value: 5, title: "5日" },
+    10: { value: 10, title: "10日" },
+    15: { value: 15, title: "15日" },
+    20: { value: 20, title: "20日" },
+    25: { value: 25, title: "25日" },
+    0: { value: 0, title: "月末" },
   });
 
   /**
    * Options for selection components
    */
   static OPTIONS = [
-    { title: "5日", value: CutoffDate.VALUES.DAY_5 },
-    { title: "10日", value: CutoffDate.VALUES.DAY_10 },
-    { title: "15日", value: CutoffDate.VALUES.DAY_15 },
-    { title: "20日", value: CutoffDate.VALUES.DAY_20 },
-    { title: "25日", value: CutoffDate.VALUES.DAY_25 },
-    { title: "月末", value: CutoffDate.VALUES.END_OF_MONTH },
+    { title: "5日", value: CutoffDate.VALUES[5].value },
+    { title: "10日", value: CutoffDate.VALUES[10].value },
+    { title: "15日", value: CutoffDate.VALUES[15].value },
+    { title: "20日", value: CutoffDate.VALUES[20].value },
+    { title: "25日", value: CutoffDate.VALUES[25].value },
+    { title: "月末", value: CutoffDate.VALUES[0].value },
   ];
 
   /**
@@ -50,11 +50,11 @@ export default class CutoffDate {
    * @returns {number} Actual cutoff day
    * @example
    * // Get cutoff day for February 2024 with month-end setting
-   * const cutoffDay = CutoffDate.calculateActualCutoffDay(2024, 1, CutoffDate.VALUES.END_OF_MONTH);
+   * const cutoffDay = CutoffDate.calculateActualCutoffDay(2024, 1, CutoffDate.VALUES[0].value);
    * // Returns 29 (leap year)
    */
   static calculateActualCutoffDay(year, month, cutoffDateValue) {
-    if (cutoffDateValue === CutoffDate.VALUES.END_OF_MONTH) {
+    if (cutoffDateValue === CutoffDate.VALUES[0].value) {
       // Get last day of the month using UTC
       return new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
     }