tt-entities 0.1.8 → 0.1.10

package/.claude/settings.local.json

@@ -23,7 +23,23 @@
       "Bash(git -C /Users/hosam/Documents/TatayabNewEra/Backend/tatayab-backend-user diff src/modules/cart/cart-recovery.service.ts)",
       "Bash(git -C /Users/hosam/Documents/TatayabNewEra/Backend/tatayab-backend-user add src/modules/cart/cart-recovery.service.ts)",
       "Bash(git -C /Users/hosam/Documents/TatayabNewEra/Backend/tatayab-backend-user cherry-pick b59cf95)",
-      "Bash(python3 -c \"import json,sys; d=json.load\\(sys.stdin\\); print\\(d['version']\\)\")"
+      "Bash(python3 -c \"import json,sys; d=json.load\\(sys.stdin\\); print\\(d['version']\\)\")",
+      "Bash(git -C /Users/hosam/Documents/TatayabNewEra/Backend/tatayab-backend-user add src/modules/catalog/dto/catalog-list-filter.dto.ts src/modules/catalog/catalog-list.service.ts src/modules/popup-ad/ src/app.module.ts)",
+      "Bash(git -C /Users/hosam/Documents/TatayabNewEra/Backend/tatayab-backend-user commit -m \"Add popup-ad module and skus filter to catalog \\(products + bundles\\)\")",
+      "Bash(mkdir -p /Users/hosam/Documents/TatayabNewEra/Frontend/tatayab-all-dashboard/resources/js/pages/marketing/popup-ads)",
+      "Bash(git -C /Users/hosam/Documents/TatayabNewEra/Frontend/tatayab-all-dashboard add app/Models/PopupAd.php app/Http/Controllers/Api/PopupAdController.php resources/js/pages/marketing/popup-ads/index.vue routes/api.php resources/js/navigation/vertical/apps-and-pages.js)",
+      "Bash(git -C /Users/hosam/Documents/TatayabNewEra/Frontend/tatayab-all-dashboard commit -m \"Add Popup Ads module under Marketing \\(CRUD, store targeting, weighted CTA\\)\")",
+      "Bash(python3 /private/tmp/claude-501/-Users-hosam-Documents-TatayabNewEra-DB-tatayab-database-all/6a788c09-9718-4502-8db2-6713ea7c0f06/scratchpad/build_collection.py)",
+      "Bash(curl -s -X PUT -H 'X-API-Key: PMAK-6a4d14e8ef7e880001a1ac00-580a5446eaec7817c7b9f1ebc43edac421' -H 'Content-Type: application/json' -d @/private/tmp/claude-501/-Users-hosam-Documents-TatayabNewEra-DB-tatayab-database-all/6a788c09-9718-4502-8db2-6713ea7c0f06/scratchpad/tatayab_col_updated.json https://api.getpostman.com/collections/55461900-4dbf9438-685b-45e2-992b-61c0bf18e4fd)",
+      "Bash(git add *)",
+      "Bash(git commit *)",
+      "Bash(sudo npm install tt-entities@0.1.9)",
+      "Bash(unzip -l \"/Users/hosam/Downloads/New folder \\(2\\).zip\")",
+      "Bash(grep -v \"/$\")",
+      "Bash(awk '{print $NF}')",
+      "Bash(grep \"\\\\.png$\")",
+      "Bash(grep -v \"\\\\-1\\\\.png$\")",
+      "Bash(awk '{ *)"
     ]
   }
 }

package/dist/libs/tatayab-entities-library/entities/area.entity.d.ts

@@ -6,4 +6,6 @@ export declare class Area extends Model {
     countryId: number;
     parentId?: number;
     country: Country;
+    parent?: Area;
+    children?: Area[];
 }

package/dist/libs/tatayab-entities-library/entities/area.entity.js

@@ -32,13 +32,22 @@ __decorate([
     __metadata("design:type", Number)
 ], Area.prototype, "countryId", void 0);
 __decorate([
-    sequelize_typescript_1.Column,
+    (0, sequelize_typescript_1.ForeignKey)(() => Area),
+    (0, sequelize_typescript_1.Column)({ allowNull: true }),
     __metadata("design:type", Number)
 ], Area.prototype, "parentId", void 0);
 __decorate([
     (0, sequelize_typescript_1.BelongsTo)(() => country_entity_1.Country),
     __metadata("design:type", country_entity_1.Country)
 ], Area.prototype, "country", void 0);
+__decorate([
+    (0, sequelize_typescript_1.BelongsTo)(() => Area, { foreignKey: 'parentId', as: 'parent' }),
+    __metadata("design:type", Area)
+], Area.prototype, "parent", void 0);
+__decorate([
+    (0, sequelize_typescript_1.HasMany)(() => Area, { foreignKey: 'parentId', as: 'children' }),
+    __metadata("design:type", Array)
+], Area.prototype, "children", void 0);
 exports.Area = Area = __decorate([
     sequelize_typescript_1.Table
 ], Area);

package/dist/libs/tatayab-entities-library/entities/area.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"area.entity.js","sourceRoot":"","sources":["../../../../libs/tatayab-entities-library/src/entities/area.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAM8B;AAC9B,qDAA2C;AAGpC,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,4BAAK;CAmB9B,CAAA;AAnBY,oBAAI;AAEP;IADP,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;;oCACN;AAGf;IADP,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;;oCACN;AAOf;IALP,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,wBAAO,CAAC;IACzB,IAAA,6BAAM,EAAC;QACN,SAAS,EAAE,KAAK;QAChB,QAAQ,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,oBAAoB,EAAE,EAAE;KACrD,CAAC;;uCACwB;AAGlB;IADP,6BAAM;;sCACmB;AAGlB;IADP,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,wBAAO,CAAC;8BACR,wBAAO;qCAAC;eAlBd,IAAI;IADhB,4BAAK;GACO,IAAI,CAmBhB"}
+{"version":3,"file":"area.entity.js","sourceRoot":"","sources":["../../../../libs/tatayab-entities-library/src/entities/area.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAO8B;AAC9B,qDAA2C;AAGpC,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,4BAAK;CA0B9B,CAAA;AA1BY,oBAAI;AAEP;IADP,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;;oCACN;AAGf;IADP,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;;oCACN;AAOf;IALP,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,wBAAO,CAAC;IACzB,IAAA,6BAAM,EAAC;QACN,SAAS,EAAE,KAAK;QAChB,QAAQ,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,oBAAoB,EAAE,EAAE;KACrD,CAAC;;uCACwB;AAIlB;IAFP,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC;IACtB,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;sCACF;AAGlB;IADP,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,wBAAO,CAAC;8BACR,wBAAO;qCAAC;AAGjB;IADP,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;8BAC/C,IAAI;oCAAC;AAGd;IADP,IAAA,8BAAO,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC;;sCACtC;eAzBf,IAAI;IADhB,4BAAK;GACO,IAAI,CA0BhB"}

package/dist/libs/tatayab-entities-library/entities/shipping-rule.entity.d.ts

@@ -11,6 +11,7 @@ export declare class ShippingRule extends Model {
     carrierName?: string;
     shippingCost?: number;
     freeShippingThreshold?: number;
+    vatPercentage: number;
     isActive: boolean;
     notes?: string;
     inventory: Inventory;

package/dist/libs/tatayab-entities-library/entities/shipping-rule.entity.js

@@ -52,6 +52,10 @@ __decorate([
     (0, sequelize_typescript_1.Column)({ type: sequelize_typescript_1.DataType.DECIMAL(10, 3), allowNull: true }),
     __metadata("design:type", Number)
 ], ShippingRule.prototype, "freeShippingThreshold", void 0);
+__decorate([
+    (0, sequelize_typescript_1.Column)({ type: sequelize_typescript_1.DataType.DECIMAL(5, 2), allowNull: false, defaultValue: 0 }),
+    __metadata("design:type", Number)
+], ShippingRule.prototype, "vatPercentage", void 0);
 __decorate([
     (0, sequelize_typescript_1.Column)({ allowNull: false, defaultValue: true }),
     __metadata("design:type", Boolean)

package/dist/libs/tatayab-entities-library/entities/shipping-rule.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"shipping-rule.entity.js","sourceRoot":"","sources":["../../../../libs/tatayab-entities-library/src/entities/shipping-rule.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAO8B;AAC9B,yDAA+C;AAC/C,qDAA2C;AAC3C,iDAAuC;AAGhC,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,4BAAK;CAmDtC,CAAA;AAnDY,oCAAY;AAIf;IAFP,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,4BAAS,CAAC;IAC3B,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;;iDACD;AAKpB;IAFP,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,wBAAO,CAAC;IACzB,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;;+CACH;AAMlB;IAFP,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,oBAAK,CAAC;IACvB,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;6CACH;AAGjB;IADP,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;6CACtB;AAGhB;IADP,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;6CACtB;AAIhB;IADP,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;iDACC;AAIrB;IADP,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;kDAC9C;AAItB;IADP,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;2DACpB;AAG/B;IADP,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;;8CACvB;AAGlB;IADP,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;2CACL;AAKf;IADP,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,4BAAS,CAAC;8BACR,4BAAS;+CAAC;AAGrB;IADP,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,wBAAO,CAAC;8BACR,wBAAO;6CAAC;AAGjB;IADP,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,oBAAK,CAAC;8BACP,oBAAK;2CAAC;uBAlDX,YAAY;IADxB,4BAAK;GACO,YAAY,CAmDxB"}
+{"version":3,"file":"shipping-rule.entity.js","sourceRoot":"","sources":["../../../../libs/tatayab-entities-library/src/entities/shipping-rule.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAO8B;AAC9B,yDAA+C;AAC/C,qDAA2C;AAC3C,iDAAuC;AAGhC,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,4BAAK;CAuDtC,CAAA;AAvDY,oCAAY;AAIf;IAFP,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,4BAAS,CAAC;IAC3B,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;;iDACD;AAKpB;IAFP,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,wBAAO,CAAC;IACzB,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;;+CACH;AAMlB;IAFP,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,oBAAK,CAAC;IACvB,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;6CACH;AAGjB;IADP,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;6CACtB;AAGhB;IADP,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;6CACtB;AAIhB;IADP,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;iDACC;AAIrB;IADP,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;kDAC9C;AAItB;IADP,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;2DACpB;AAI/B;IADP,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;mDAC9C;AAGtB;IADP,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;;8CACvB;AAGlB;IADP,IAAA,6BAAM,EAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;2CACL;AAKf;IADP,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,4BAAS,CAAC;8BACR,4BAAS;+CAAC;AAGrB;IADP,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,wBAAO,CAAC;8BACR,wBAAO;6CAAC;AAGjB;IADP,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,oBAAK,CAAC;8BACP,oBAAK;2CAAC;uBAtDX,YAAY;IADxB,4BAAK;GACO,YAAY,CAuDxB"}

package/libs/tatayab-entities-library/src/entities/area.entity.ts

@@ -2,6 +2,7 @@ import {
   BelongsTo,
   Column,
   ForeignKey,
+  HasMany,
   Model,
   Table,
 } from 'sequelize-typescript';
@@ -22,9 +23,16 @@ export class Area extends Model {
   })
   declare countryId: number;
 
-  @Column
+  @ForeignKey(() => Area)
+  @Column({ allowNull: true })
   declare parentId?: number;
 
   @BelongsTo(() => Country)
   declare country: Country;
+
+  @BelongsTo(() => Area, { foreignKey: 'parentId', as: 'parent' })
+  declare parent?: Area;
+
+  @HasMany(() => Area, { foreignKey: 'parentId', as: 'children' })
+  declare children?: Area[];
 }

package/libs/tatayab-entities-library/src/entities/shipping-rule.entity.ts

@@ -46,6 +46,10 @@ export class ShippingRule extends Model {
   @Column({ type: DataType.DECIMAL(10, 3), allowNull: true })
   declare freeShippingThreshold?: number;
 
+  // VAT percentage applied on subtotal for this shipping rule (e.g. 5 = 5%)
+  @Column({ type: DataType.DECIMAL(5, 2), allowNull: false, defaultValue: 0 })
+  declare vatPercentage: number;
+
   @Column({ allowNull: false, defaultValue: true })
   declare isActive: boolean;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-entities",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Tatayab entities library",
   "main": "dist/libs/tatayab-entities-library/index.js",
   "types": "dist/libs/tatayab-entities-library/index.d.ts",

package/src/database/migrations/20260709100000-add-vat-percentage-to-shipping-rules.js

@@ -0,0 +1,16 @@
+'use strict';
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.addColumn('ShippingRules', 'vatPercentage', {
+      type: Sequelize.DECIMAL(5, 2),
+      allowNull: false,
+      defaultValue: 0,
+      after: 'freeShippingThreshold',
+    });
+  },
+
+  async down(queryInterface) {
+    await queryInterface.removeColumn('ShippingRules', 'vatPercentage');
+  },
+};

package/src/database/migrations/20260710100000-add-area-parent-fk.js

@@ -0,0 +1,18 @@
+'use strict';
+
+module.exports = {
+  async up(queryInterface) {
+    await queryInterface.addConstraint('Areas', {
+      fields: ['parentId'],
+      type: 'foreign key',
+      name: 'fk_areas_parentId',
+      references: { table: 'Areas', field: 'id' },
+      onDelete: 'SET NULL',
+      onUpdate: 'CASCADE',
+    });
+  },
+
+  async down(queryInterface) {
+    await queryInterface.removeConstraint('Areas', 'fk_areas_parentId');
+  },
+};