meemup-library 1.2.6 → 1.2.8

package/dist/controllers/ApiController.d.ts

@@ -5,7 +5,6 @@ import IDriverAccount from "../interfaces/IDriverAccount";
 export default class ApiController {
     account: IAccount | IDriverAccount;
     constructor(account: IAccount | IDriverAccount);
-    private getCompanyId;
     defaultHeader(authorization?: boolean): Promise<{
         Authorization?: string | undefined;
         companyId: string;
@@ -18,4 +17,5 @@ export default class ApiController {
     getWithAuth(url: string, header?: any): Promise<IAnswer>;
     get(url: string, header?: any): Promise<IAnswer>;
     deleteWithAuth(url: string, header?: any): Promise<IAnswer>;
+    private getCompanyId;
 }

package/dist/controllers/ColorController.d.ts

@@ -1,5 +1,5 @@
 import IPointOfSaleSetting from "../interfaces/IPointOfSaleSetting";
-import IDProduct from "../interfaces/database/IDProduct";
+import IProduct from "../interfaces/IProduct";
 /**
  * کلاس ColorController برای مدیریت رنگ‌ها و تولید رنگ متن بر اساس رنگ پس زمینه استفاده می‌شود.
  */
@@ -11,10 +11,10 @@ declare class ColorController {
      */
     generateContrastColorForHex(background_color: string): string;
     /**
-       * متد generateContrastColorForRgba برای تولید رنگ متن بر اساس رنگ پس زمینه به صورت RGBA استفاده می‌شود.
-       * @param rgba_color رنگ پس زمینه به صورت RGBA (رنگ، سبز، آبی، شفافیت).
-       * @returns رنگ متن متناسب (به صورت hex) که برای نمایش بر روی رنگ پس زمینه انتخاب شده است.
-       */
+     * متد generateContrastColorForRgba برای تولید رنگ متن بر اساس رنگ پس زمینه به صورت RGBA استفاده می‌شود.
+     * @param rgba_color رنگ پس زمینه به صورت RGBA (رنگ، سبز، آبی، شفافیت).
+     * @returns رنگ متن متناسب (به صورت hex) که برای نمایش بر روی رنگ پس زمینه انتخاب شده است.
+     */
     generateContrastColorForRgba(rgba_color: string): string;
     /**
      * متد generateContrastColorForRgb برای تولید رنگ متن بر اساس رنگ پس زمینه به صورت RGB استفاده می‌شود.
@@ -23,15 +23,15 @@ declare class ColorController {
      */
     generateContrastColorForRgb(rgb_color: string): string;
     /**
-    * متد generateContrastColorForBackground برای تولید رنگ متن بر اساس رنگ پس زمینه مورد نظر استفاده می‌شود.
-    * اگر رنگ پس زمینه null یا "transparent" باشد، رنگ متن #000000 (سیاه) برگردانده می‌شود.
-    * در غیر این صورت، از سه متد generateContrastColorForRgb و generateContrastColorForRgba و generateContrastColorForHex برای تولید رنگ متن استفاده می‌شود.
-    * اگر در هیچکدام از سه متد مورد نظر نگنجید، رنگ متن #000000 (سیاه) برگردانده می‌شود.
-    * @param background_color رنگ پس زمینه به هر فرمتی که می‌تواند string یا null باشد.
-    * @returns رنگ متن متناظر (به صورت hex) که برای نمایش بر روی رنگ پس زمینه انتخاب شده است.
-    */
+     * متد generateContrastColorForBackground برای تولید رنگ متن بر اساس رنگ پس زمینه مورد نظر استفاده می‌شود.
+     * اگر رنگ پس زمینه null یا "transparent" باشد، رنگ متن #000000 (سیاه) برگردانده می‌شود.
+     * در غیر این صورت، از سه متد generateContrastColorForRgb و generateContrastColorForRgba و generateContrastColorForHex برای تولید رنگ متن استفاده می‌شود.
+     * اگر در هیچکدام از سه متد مورد نظر نگنجید، رنگ متن #000000 (سیاه) برگردانده می‌شود.
+     * @param background_color رنگ پس زمینه به هر فرمتی که می‌تواند string یا null باشد.
+     * @returns رنگ متن متناظر (به صورت hex) که برای نمایش بر روی رنگ پس زمینه انتخاب شده است.
+     */
     generateContrastColorForBackground(background_color: string | null, default_text_color?: string): string;
-    generateColorForPosProduct(product: IDProduct, setting: IPointOfSaleSetting, defaultBackgroundColor: any, defaultTextColor: any): {
+    generateColorForPosProduct(product: IProduct, setting: IPointOfSaleSetting, defaultBackgroundColor: any, defaultTextColor: any): {
         backgroundColor: any;
         textColor: any;
     };

package/dist/controllers/ColorController.js

@@ -20,10 +20,10 @@ class ColorController {
         return text_color;
     }
     /**
-       * متد generateContrastColorForRgba برای تولید رنگ متن بر اساس رنگ پس زمینه به صورت RGBA استفاده می‌شود.
-       * @param rgba_color رنگ پس زمینه به صورت RGBA (رنگ، سبز، آبی، شفافیت).
-       * @returns رنگ متن متناسب (به صورت hex) که برای نمایش بر روی رنگ پس زمینه انتخاب شده است.
-       */
+     * متد generateContrastColorForRgba برای تولید رنگ متن بر اساس رنگ پس زمینه به صورت RGBA استفاده می‌شود.
+     * @param rgba_color رنگ پس زمینه به صورت RGBA (رنگ، سبز، آبی، شفافیت).
+     * @returns رنگ متن متناسب (به صورت hex) که برای نمایش بر روی رنگ پس زمینه انتخاب شده است.
+     */
     generateContrastColorForRgba(rgba_color) {
         var _a;
         // استخراج مقادیر R، G، B از RGBA
@@ -56,13 +56,13 @@ class ColorController {
         return text_color;
     }
     /**
-    * متد generateContrastColorForBackground برای تولید رنگ متن بر اساس رنگ پس زمینه مورد نظر استفاده می‌شود.
-    * اگر رنگ پس زمینه null یا "transparent" باشد، رنگ متن #000000 (سیاه) برگردانده می‌شود.
-    * در غیر این صورت، از سه متد generateContrastColorForRgb و generateContrastColorForRgba و generateContrastColorForHex برای تولید رنگ متن استفاده می‌شود.
-    * اگر در هیچکدام از سه متد مورد نظر نگنجید، رنگ متن #000000 (سیاه) برگردانده می‌شود.
-    * @param background_color رنگ پس زمینه به هر فرمتی که می‌تواند string یا null باشد.
-    * @returns رنگ متن متناظر (به صورت hex) که برای نمایش بر روی رنگ پس زمینه انتخاب شده است.
-    */
+     * متد generateContrastColorForBackground برای تولید رنگ متن بر اساس رنگ پس زمینه مورد نظر استفاده می‌شود.
+     * اگر رنگ پس زمینه null یا "transparent" باشد، رنگ متن #000000 (سیاه) برگردانده می‌شود.
+     * در غیر این صورت، از سه متد generateContrastColorForRgb و generateContrastColorForRgba و generateContrastColorForHex برای تولید رنگ متن استفاده می‌شود.
+     * اگر در هیچکدام از سه متد مورد نظر نگنجید، رنگ متن #000000 (سیاه) برگردانده می‌شود.
+     * @param background_color رنگ پس زمینه به هر فرمتی که می‌تواند string یا null باشد.
+     * @returns رنگ متن متناظر (به صورت hex) که برای نمایش بر روی رنگ پس زمینه انتخاب شده است.
+     */
     generateContrastColorForBackground(background_color, default_text_color = "#000") {
         // اگر رنگ پس زمینه null یا "transparent" باشد، رنگ سیاه را برگردانید
         if (background_color === null || background_color.trim().toLowerCase() === "transparent") {

package/dist/controllers/MoneyController.js

@@ -23,7 +23,10 @@ export default new class MoneyController {
         };
     }
     format(money, currency = "$", preText = "") {
-        return `${preText}${currency}${Intl.NumberFormat("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(this.round(money))}`;
+        return `${preText}${currency}${Intl.NumberFormat("en-US", {
+            minimumFractionDigits: 2,
+            maximumFractionDigits: 2
+        }).format(this.round(money))}`;
     }
     sum(values) {
         let sum = 0;

package/dist/controllers/OrderScreenController.d.ts

@@ -1,14 +1,14 @@
 import IOrderScreenState from "../interfaces/IOrderScreenState";
 import EnumOrderType from "../enums/EnumOrderType";
 import IOrderItem from "../interfaces/order/IOrderItem";
-import IDProduct from "../interfaces/database/IDProduct";
 import ICategory from "../interfaces/ICategory";
+import IProduct from "../interfaces/IProduct";
 declare const _default: {
     checkDayWeek: (index: number, weekDays: number) => boolean;
     fetchCategories(categories: ICategory[]): ICategory[];
-    fetchProducts(arg: IOrderScreenState, products: IDProduct[], categories: ICategory[]): IDProduct[];
-    searchProduct(products: IDProduct[], word: string): IDProduct[];
-    productPrice(product: IDProduct, orderType: EnumOrderType): number;
-    productCountInOrder(product: IDProduct, items: IOrderItem[]): number;
+    fetchProducts(arg: IOrderScreenState, products: IProduct[], categories: ICategory[]): IProduct[];
+    searchProduct(products: IProduct[], word: string): IProduct[];
+    productPrice(product: IProduct, orderType: EnumOrderType): number;
+    productCountInOrder(product: IProduct, items: IOrderItem[]): number;
 };
 export default _default;

package/dist/controllers/PrintContentController.js

@@ -208,290 +208,290 @@ export default new class {
         const { order, company, customer, products, paymentInfo } = detail;
         const { printOnlyCertainCategoriesList, printOnlyCertainCategories, printOnlyCertainProductsList, printOnlyCertainProducts, customerAddressFontSize, showCustomerInfo, orderInfo, showPrices, textAfterAddress, textAfterAddressCenter, nameAddressShow, nameAddressCenter, font, fontSize, marginBottom, marginLeft, marginRight, marginTop, logoAvailable, logoCenter, logoUrl, sortProducts, textBeforeProducts, textBeforeProductsCenter, customerOnlinePaymentAgrementSection, id, promotionCodeNote, promotionId, qrCodeOrderDetails, showCategoryTitle, showProductKitchenName, textEnd, textEndCenter, width, paper } = template;
         const address = this.createAddressText(customer);
-        return (`
-      <div style="font-family: ${font}; font-weight: 500; font-size: ${fontSize + "px"}; min-width: ${this.calculatePaperSize(paper, width)}; width: ${this.calculatePaperSize(paper, width)}; padding : ${marginTop + "mm"} ${marginRight + "mm"} ${marginBottom + "mm"} ${marginLeft + "mm"};">
-      <img alt="" style=" display : ${logoAvailable ? "block" : "none"}; margin : ${logoCenter ? "auto" : "0"}; width: 200px; min-height : 50px;" src="${rootUrl}${company.id}/${logoUrl}" /> 
-      <p style=" margin: 5px 0; line-height: 1; display: ${nameAddressShow ? "block" : "none"}; text-align:${nameAddressCenter ? "center" : "start"};">
-           ${company.title}
-      </p>
-      <p style="margin:5px 0; display:${nameAddressShow ? "block" : "none"}; text-align:${nameAddressCenter ? "center" : "start"};">
-          ${company.address}
-      </p>
-      <p style="margin: 5px 0; line-height: 1; display: ${nameAddressShow ? "block" : "none"}; text-align:${nameAddressCenter ? "center" : "start"};">
-          ${PhoneController.formatPhoneNumber(company.phone)}
-      </p>
-      <p style="margin: 5px 0; line-height: 1; display: ${textAfterAddress ? "block" : "none"}; text-align:${textAfterAddressCenter ? "center" : "start"};">
-          ${textAfterAddress}
-      </p>
-
-    <div style=" display:${order.orderTypeString ? "flex" : "none"}; flex-direction: column; align-items: center; justify-content: center; margin: 8px 0;" >
-   
-      <p style=" font-size: x-large; font-weight: bold; text-align: center;line-height: 0.7;  margin: 5px 0;"> #${order.orderNumber}&nbsp;&nbsp;&nbsp;${order.orderTypeString} </p>
-      
-      <strong style="font-size: x-large; text-align: center;">
-        &#9201;${order.asSoonAsPossible && "ASAP"}&nbsp;${this.formatDateTime(order.desiredDate, "time")}
-      </strong>
-      
-      ${order.estimatedTime ? `<strong style="display:block; font-size:x-large; text-align:center;">Est. Time ${this.substring(order.estimatedTime, 0, order.estimatedTime.length - 3)}</strong>` : ""}     
-    </div>
- 
-  
-   <div style="display: ${showPrices ? "block" : "none"}; border-top: 1px solid black;">
-      <strong style="display : block; margin: 5px 0; line-height: 1;">PAY INFORMATION: </strong>
-      <strong style="font-size: large; margin: 0 0 16px 0; line-height: 1.5;">${order.paymentTypeString + (order.paymentType === 2 ? `: ${this.ccyFormat(order.totalAmount, symbol)} ` : " ") + " - " + order.paymentStateString}</strong>
-  
-      <p style="margin: 5px 0; line-height: 1;  display: ${order.paymentType === 1 ? "block" : "none"};">Credit Card : <strong>**** **** **** ${order.lastFourDigits}</strong></p>
- 
-    </div>
-    
-    <p style="display:${orderInfo ? "block" : "none"}; margin: 5px 0; line-height: 1;"> Order number : <strong>#${order.orderNumber}</strong> </p>
-    <p style="display:${orderInfo ? "block" : "none"};  margin: 5px 0; line-height: 1;">
-     ${order.orderTypeString}:<span style="font-size: x-large;">&#9201;</span><strong>on ${this.formatDateTime(order.desiredDate)}</strong>
-    </p>
-
-    ${order.estimatedTime ? `<p style="display: block; margin: 5px 0; line-height: 1;">Estimated Time : <strong>${(_a = order.estimatedTime) === null || _a === void 0 ? void 0 : _a.substring(0, order.estimatedTime.length - 3)}</strong></p>` : ""}
-
-    <p style="display:block; margin: 5px 0; line-height: 1;">Reg. Date:<strong>${this.formatDateTime(order.registrationDate)}</strong> </p>
-
-    <div style="border-top: 1px solid black;">
-   
-          <div style="display:${showCustomerInfo ? "block" : "none"}">
-  
-              <strong style="display:block; margin: 5px 0; line-height: 1;"> CUSTOMER DATA :  </strong>
-              <p style="display:${customer.fullName ? "block" : "none"}; margin: 5px 0; line-height: 1;">${customer.fullName}</p>
-              <p style="display:${customer.phoneNumber ? "block" : "none"}; margin: 5px 0; line-height: 1;">${PhoneController.formatPhoneNumber(customer.phoneNumber)}</p>
-              <p style="display:${address ? "block" : "none"}; font-size: ${customerAddressFontSize + "px"}; margin: 5px 0; line-height: 1;">
-                  ${address !== null ? address[0] : null}
-                  <br/>
-                  ${address !== null ? address[1] : null}
-              </p>
-              <p style="display:${customer.email ? "block" : "none"}; margin: 5px 0; line-height: 1;">${customer.email}</p>
-      
-          </div>
-  
-          <strong style="display:block; font-size: ${(fontSize * 1.2).toFixed(0) + "px"}; margin: 10px 0; line-height: 1;">
-                  ${this.sum(this.filterByCategoryList(this.sortProduct(products, sortProducts), printOnlyCertainCategoriesList, printOnlyCertainCategories, printOnlyCertainProductsList, printOnlyCertainProducts).map((row) => row.quantity))} ITEM
-         </strong>
-  
-         <p style="display:${textBeforeProducts ? "block" : "none"}; margin: 5px 0; padding-left : 15px; text-align : ${textBeforeProductsCenter ? "center" : "start"}; line-height: 1;"> ${textBeforeProducts} </p>
-      
-      </div>
-  
-    <div style="border-top : 1px solid black;">
-     
-      <div style="padding : 4px 1px; display : flex; flex-direction : row; border-bottom : 1px solid black; font-weight : bold;">
-  
-        <div style="width : 40px; min-width : 40px; max-width : 40px;">#</div>
-        <div style="flex-wrap : wrap; word-wrap : break-word;">Products</div>
-        <div style="flex-grow : 1; text-align: end;">Price</div>
-  
-      </div>
-  
-  
-      ${this.filterByCategoryList(this.sortProduct(products, sortProducts), printOnlyCertainCategoriesList, printOnlyCertainCategories, printOnlyCertainProductsList, printOnlyCertainProducts).map((row) => (`<div style="border-bottom : 1px solid black; padding : 0 1px; display : flex;  flex-direction : row; justify-content : flex-end;">
-              
-              <div style="width : 40px; min-width : 40px; max-width : 40px">${row.quantity}X</div>
-              
-              <div style="flex-wrap : wrap; word-wrap : break-word; text-align : left;">
-                                         
-                ${(showCategoryTitle && row.categoryTitle !== "" && row.categoryTitle !== null) ? "[" + row.categoryTitle + "]" : ""} ${showProductKitchenName && row.kitchenReceiptName !== "" ? row.kitchenReceiptName : row.title}
-                ${row.extrasNames ? row.extrasNames.split(" , ").map(i => `<div>+${i}</div>`).join("") : ""}
-                ${row.note ? `<div><span style="font-size: x-large;">&#128488;</span>{note}</div>` : ""}
-  
-              </div>
-  
-              <div style="flex-grow : 1; text-align : right;">${this.ccyFormat(row.totalAmount, symbol)}</div>
-          </div>`)).join("")}
-  
-      <div style="display : ${showPrices ? "flex" : "none"}; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px dotted black;">
-        <div style="min-width : 150px; flex-grow : 1; text-align: end;">Order Amount :</div>
-        <div style="min-width : 100px; text-align: end;">${this.ccyFormat(order.orderAmount, symbol)}</div>
-      </div>
-  
-      <div style="display : ${order.orderType === 1 && order.deliveryCost > 0 ? "flex" : "none"}; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px dotted black;">
-        <div style="min-width : 150px; flex-grow : 1; text-align: end;">Delivery costs : </div>
-        <div style="min-width : 100px; text-align: end;">${this.ccyFormat(order.deliveryCost, symbol)}</div>
-      </div>
-  
-      <div style="display : ${order.discountAmount > 0 ? "flex" : "none"}; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px dotted black;">
-        <div style="min-width : 150px; flex-grow : 1; text-align: end;">Discount : </div>
-        <div style="min-width : 100px; text-align: end;">${(order.discountAmount > 0 ? "- " : "") + this.ccyFormat(order.discountAmount, symbol)}</div>
-      </div>
-      
-      <div style="display : flex; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px dotted black;">
-        <div style="min-width : 150px; flex-grow : 1; text-align: end;">Subtotal : </div>
-        <div style="min-width : 100px; text-align: end;">${this.ccyFormat(order.subtotalAmount, symbol)}</div>
-      </div>
-  
-      <div style="display : ${order.hstAmount > 0 && order.serviceFee < 1 ? "flex" : "none"}; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px dotted black;">
-        <div style="min-width : 150px; flex-grow : 1; text-align: end;">HST(${this.ccyFormat(order.hstPercentage)}%) : </div>
-        <div style="min-width : 100px; text-align: end;">${this.ccyFormat(order.hstAmount, symbol)}</div>
-      </div>
-  
-      <div style="display : ${order.tipAmount > 0 ? "flex" : "none"}; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px dotted black;">
-        <div style="min-width : 150px; flex-grow : 1; text-align: end;">Tip : </div>
-        <div style="min-width : 100px; text-align: end;">${this.ccyFormat(order.tipAmount, symbol)}</div>
-      </div>
-  
-      <div style="display : flex; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px solid black;">
-        <strong style="min-width : 150px; flex-grow : 1; font-size: larger; text-align: end;">${order.paymentType === 1 ? "Total" : "Total & Still to pay"} : </strong>
-        <strong style="min-width : 100px; font-size: larger; text-align: end;">${this.ccyFormat(order.totalAmount, symbol)}</strong>
-      </div>
-  
-    </div>
-  
-    <div class="border-top : 1px solid black;">
-      <div style="margin : 5px 0; line-height: 1;">
-        <strong>Remarks customer:</strong>
-        <em style="display : ${!order.remarks ? "initial" : "none"}">There are no remarks</em>
-      </div>
-      <strong style="display : ${order.remarks ? "block" : "none"};">${order.remarks}</strong>
-    </div>
-  
-    <div style="display : ${order.paymentType === 1 && customerOnlinePaymentAgrementSection ? "block" : "none"}; border-top : 1px solid black; text-align : center;">
-  
-        <p style="margin : 5px 0; line-height: 1;"><strong>CREDIT CARD : </strong>**** **** **** ${order.lastFourDigits}</p>
-        
-        <strong style="margin : 5px 0; line-height: 1;">
-            I agree to pay above total amount according to card issuer agreement
-        </strong>
-        <br/>
-        <br/>
-        <strong style="margin : 5px 0; line-height: 1;">SIGNATURE</strong>
-    </div>
-
-    <div style="display : ${promotionId ? "block" : "none"}; border-top : 1px solid black; margin : 5px 0; line-height: 1; text-align : ${textEndCenter ? "center" : "start"}">
-        ${promotionCodeNote}
-    </div>
-  
-    <div style="margin : 0 16px; display : ${(paymentInfo !== null && order.paymentType === 8 && ((_b = paymentInfo === null || paymentInfo === void 0 ? void 0 : paymentInfo.metadata) === null || _b === void 0 ? void 0 : _b.length) > 0) ? "block" : "none"};">
-        ${paymentInfo === null || paymentInfo === void 0 ? void 0 : paymentInfo.metadata.map((item) => (`<div style="display : flex;  flex-direction : row; align-items : center; justify-content : flex-start; margin-bottom : 8px;">
-                 <strong style="margin : 0 16px 0 0; line-height: 1;"> ${item.text} </strong>
-                 <strong style="margin : 0 16px 0 0; line-height: 1;" > ${item.value}</strong>
-              </div>`))}
-      </div>
-
-    <div style="display : ${qrCodeOrderDetails ? "flex" : "none"}; justify-content: center; align-items: center; border-top : 1px solid black; border-bottom : 1px solid black;">
-      <img alt="" style="width: 100px; height: 100px; margin: auto;" src="${order.qrCodeDetailUrl}" />
-    </div>
-  
-    <p style="display : ${textEnd ? "block" : "none"}; text-align : ${textEndCenter ? "center" : "start"}; line-height: 1;  margin-top: 4px;">${textEnd}</p>
-  
-    <strong style="display: block; font-size : x-small; text-align : center; margin-top: 4px; ">fs-${company.id}-${order.id}-${id}</strong>
-  
-  
-</div>       
+        return (`
+      <div style="font-family: ${font}; font-weight: 500; font-size: ${fontSize + "px"}; min-width: ${this.calculatePaperSize(paper, width)}; width: ${this.calculatePaperSize(paper, width)}; padding : ${marginTop + "mm"} ${marginRight + "mm"} ${marginBottom + "mm"} ${marginLeft + "mm"};">
+      <img alt="" style=" display : ${logoAvailable ? "block" : "none"}; margin : ${logoCenter ? "auto" : "0"}; width: 200px; min-height : 50px;" src="${rootUrl}${company.id}/${logoUrl}" /> 
+      <p style=" margin: 5px 0; line-height: 1; display: ${nameAddressShow ? "block" : "none"}; text-align:${nameAddressCenter ? "center" : "start"};">
+           ${company.title}
+      </p>
+      <p style="margin:5px 0; display:${nameAddressShow ? "block" : "none"}; text-align:${nameAddressCenter ? "center" : "start"};">
+          ${company.address}
+      </p>
+      <p style="margin: 5px 0; line-height: 1; display: ${nameAddressShow ? "block" : "none"}; text-align:${nameAddressCenter ? "center" : "start"};">
+          ${PhoneController.formatPhoneNumber(company.phone)}
+      </p>
+      <p style="margin: 5px 0; line-height: 1; display: ${textAfterAddress ? "block" : "none"}; text-align:${textAfterAddressCenter ? "center" : "start"};">
+          ${textAfterAddress}
+      </p>
+
+    <div style=" display:${order.orderTypeString ? "flex" : "none"}; flex-direction: column; align-items: center; justify-content: center; margin: 8px 0;" >
+   
+      <p style=" font-size: x-large; font-weight: bold; text-align: center;line-height: 0.7;  margin: 5px 0;"> #${order.orderNumber}&nbsp;&nbsp;&nbsp;${order.orderTypeString} </p>
+      
+      <strong style="font-size: x-large; text-align: center;">
+        &#9201;${order.asSoonAsPossible && "ASAP"}&nbsp;${this.formatDateTime(order.desiredDate, "time")}
+      </strong>
+      
+      ${order.estimatedTime ? `<strong style="display:block; font-size:x-large; text-align:center;">Est. Time ${this.substring(order.estimatedTime, 0, order.estimatedTime.length - 3)}</strong>` : ""}     
+    </div>
+ 
+  
+   <div style="display: ${showPrices ? "block" : "none"}; border-top: 1px solid black;">
+      <strong style="display : block; margin: 5px 0; line-height: 1;">PAY INFORMATION: </strong>
+      <strong style="font-size: large; margin: 0 0 16px 0; line-height: 1.5;">${order.paymentTypeString + (order.paymentType === 2 ? `: ${this.ccyFormat(order.totalAmount, symbol)} ` : " ") + " - " + order.paymentStateString}</strong>
+  
+      <p style="margin: 5px 0; line-height: 1;  display: ${order.paymentType === 1 ? "block" : "none"};">Credit Card : <strong>**** **** **** ${order.lastFourDigits}</strong></p>
+ 
+    </div>
+    
+    <p style="display:${orderInfo ? "block" : "none"}; margin: 5px 0; line-height: 1;"> Order number : <strong>#${order.orderNumber}</strong> </p>
+    <p style="display:${orderInfo ? "block" : "none"};  margin: 5px 0; line-height: 1;">
+     ${order.orderTypeString}:<span style="font-size: x-large;">&#9201;</span><strong>on ${this.formatDateTime(order.desiredDate)}</strong>
+    </p>
+
+    ${order.estimatedTime ? `<p style="display: block; margin: 5px 0; line-height: 1;">Estimated Time : <strong>${(_a = order.estimatedTime) === null || _a === void 0 ? void 0 : _a.substring(0, order.estimatedTime.length - 3)}</strong></p>` : ""}
+
+    <p style="display:block; margin: 5px 0; line-height: 1;">Reg. Date:<strong>${this.formatDateTime(order.registrationDate)}</strong> </p>
+
+    <div style="border-top: 1px solid black;">
+   
+          <div style="display:${showCustomerInfo ? "block" : "none"}">
+  
+              <strong style="display:block; margin: 5px 0; line-height: 1;"> CUSTOMER DATA :  </strong>
+              <p style="display:${customer.fullName ? "block" : "none"}; margin: 5px 0; line-height: 1;">${customer.fullName}</p>
+              <p style="display:${customer.phoneNumber ? "block" : "none"}; margin: 5px 0; line-height: 1;">${PhoneController.formatPhoneNumber(customer.phoneNumber)}</p>
+              <p style="display:${address ? "block" : "none"}; font-size: ${customerAddressFontSize + "px"}; margin: 5px 0; line-height: 1;">
+                  ${address !== null ? address[0] : null}
+                  <br/>
+                  ${address !== null ? address[1] : null}
+              </p>
+              <p style="display:${customer.email ? "block" : "none"}; margin: 5px 0; line-height: 1;">${customer.email}</p>
+      
+          </div>
+  
+          <strong style="display:block; font-size: ${(fontSize * 1.2).toFixed(0) + "px"}; margin: 10px 0; line-height: 1;">
+                  ${this.sum(this.filterByCategoryList(this.sortProduct(products, sortProducts), printOnlyCertainCategoriesList, printOnlyCertainCategories, printOnlyCertainProductsList, printOnlyCertainProducts).map((row) => row.quantity))} ITEM
+         </strong>
+  
+         <p style="display:${textBeforeProducts ? "block" : "none"}; margin: 5px 0; padding-left : 15px; text-align : ${textBeforeProductsCenter ? "center" : "start"}; line-height: 1;"> ${textBeforeProducts} </p>
+      
+      </div>
+  
+    <div style="border-top : 1px solid black;">
+     
+      <div style="padding : 4px 1px; display : flex; flex-direction : row; border-bottom : 1px solid black; font-weight : bold;">
+  
+        <div style="width : 40px; min-width : 40px; max-width : 40px;">#</div>
+        <div style="flex-wrap : wrap; word-wrap : break-word;">Products</div>
+        <div style="flex-grow : 1; text-align: end;">Price</div>
+  
+      </div>
+  
+  
+      ${this.filterByCategoryList(this.sortProduct(products, sortProducts), printOnlyCertainCategoriesList, printOnlyCertainCategories, printOnlyCertainProductsList, printOnlyCertainProducts).map((row) => (`<div style="border-bottom : 1px solid black; padding : 0 1px; display : flex;  flex-direction : row; justify-content : flex-end;">
+              
+              <div style="width : 40px; min-width : 40px; max-width : 40px">${row.quantity}X</div>
+              
+              <div style="flex-wrap : wrap; word-wrap : break-word; text-align : left;">
+                                         
+                ${(showCategoryTitle && row.categoryTitle !== "" && row.categoryTitle !== null) ? "[" + row.categoryTitle + "]" : ""} ${showProductKitchenName && row.kitchenReceiptName !== "" ? row.kitchenReceiptName : row.title}
+                ${row.extrasNames ? row.extrasNames.split(" , ").map(i => `<div>+${i}</div>`).join("") : ""}
+                ${row.note ? `<div><span style="font-size: x-large;">&#128488;</span>{note}</div>` : ""}
+  
+              </div>
+  
+              <div style="flex-grow : 1; text-align : right;">${this.ccyFormat(row.totalAmount, symbol)}</div>
+          </div>`)).join("")}
+  
+      <div style="display : ${showPrices ? "flex" : "none"}; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px dotted black;">
+        <div style="min-width : 150px; flex-grow : 1; text-align: end;">Order Amount :</div>
+        <div style="min-width : 100px; text-align: end;">${this.ccyFormat(order.orderAmount, symbol)}</div>
+      </div>
+  
+      <div style="display : ${order.orderType === 1 && order.deliveryCost > 0 ? "flex" : "none"}; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px dotted black;">
+        <div style="min-width : 150px; flex-grow : 1; text-align: end;">Delivery costs : </div>
+        <div style="min-width : 100px; text-align: end;">${this.ccyFormat(order.deliveryCost, symbol)}</div>
+      </div>
+  
+      <div style="display : ${order.discountAmount > 0 ? "flex" : "none"}; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px dotted black;">
+        <div style="min-width : 150px; flex-grow : 1; text-align: end;">Discount : </div>
+        <div style="min-width : 100px; text-align: end;">${(order.discountAmount > 0 ? "- " : "") + this.ccyFormat(order.discountAmount, symbol)}</div>
+      </div>
+      
+      <div style="display : flex; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px dotted black;">
+        <div style="min-width : 150px; flex-grow : 1; text-align: end;">Subtotal : </div>
+        <div style="min-width : 100px; text-align: end;">${this.ccyFormat(order.subtotalAmount, symbol)}</div>
+      </div>
+  
+      <div style="display : ${order.hstAmount > 0 && order.serviceFee < 1 ? "flex" : "none"}; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px dotted black;">
+        <div style="min-width : 150px; flex-grow : 1; text-align: end;">HST(${this.ccyFormat(order.hstPercentage)}%) : </div>
+        <div style="min-width : 100px; text-align: end;">${this.ccyFormat(order.hstAmount, symbol)}</div>
+      </div>
+  
+      <div style="display : ${order.tipAmount > 0 ? "flex" : "none"}; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px dotted black;">
+        <div style="min-width : 150px; flex-grow : 1; text-align: end;">Tip : </div>
+        <div style="min-width : 100px; text-align: end;">${this.ccyFormat(order.tipAmount, symbol)}</div>
+      </div>
+  
+      <div style="display : flex; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px solid black;">
+        <strong style="min-width : 150px; flex-grow : 1; font-size: larger; text-align: end;">${order.paymentType === 1 ? "Total" : "Total & Still to pay"} : </strong>
+        <strong style="min-width : 100px; font-size: larger; text-align: end;">${this.ccyFormat(order.totalAmount, symbol)}</strong>
+      </div>
+  
+    </div>
+  
+    <div class="border-top : 1px solid black;">
+      <div style="margin : 5px 0; line-height: 1;">
+        <strong>Remarks customer:</strong>
+        <em style="display : ${!order.remarks ? "initial" : "none"}">There are no remarks</em>
+      </div>
+      <strong style="display : ${order.remarks ? "block" : "none"};">${order.remarks}</strong>
+    </div>
+  
+    <div style="display : ${order.paymentType === 1 && customerOnlinePaymentAgrementSection ? "block" : "none"}; border-top : 1px solid black; text-align : center;">
+  
+        <p style="margin : 5px 0; line-height: 1;"><strong>CREDIT CARD : </strong>**** **** **** ${order.lastFourDigits}</p>
+        
+        <strong style="margin : 5px 0; line-height: 1;">
+            I agree to pay above total amount according to card issuer agreement
+        </strong>
+        <br/>
+        <br/>
+        <strong style="margin : 5px 0; line-height: 1;">SIGNATURE</strong>
+    </div>
+
+    <div style="display : ${promotionId ? "block" : "none"}; border-top : 1px solid black; margin : 5px 0; line-height: 1; text-align : ${textEndCenter ? "center" : "start"}">
+        ${promotionCodeNote}
+    </div>
+  
+    <div style="margin : 0 16px; display : ${(paymentInfo !== null && order.paymentType === 8 && ((_b = paymentInfo === null || paymentInfo === void 0 ? void 0 : paymentInfo.metadata) === null || _b === void 0 ? void 0 : _b.length) > 0) ? "block" : "none"};">
+        ${paymentInfo === null || paymentInfo === void 0 ? void 0 : paymentInfo.metadata.map((item) => (`<div style="display : flex;  flex-direction : row; align-items : center; justify-content : flex-start; margin-bottom : 8px;">
+                 <strong style="margin : 0 16px 0 0; line-height: 1;"> ${item.text} </strong>
+                 <strong style="margin : 0 16px 0 0; line-height: 1;" > ${item.value}</strong>
+              </div>`))}
+      </div>
+
+    <div style="display : ${qrCodeOrderDetails ? "flex" : "none"}; justify-content: center; align-items: center; border-top : 1px solid black; border-bottom : 1px solid black;">
+      <img alt="" style="width: 100px; height: 100px; margin: auto;" src="${order.qrCodeDetailUrl}" />
+    </div>
+  
+    <p style="display : ${textEnd ? "block" : "none"}; text-align : ${textEndCenter ? "center" : "start"}; line-height: 1;  margin-top: 4px;">${textEnd}</p>
+  
+    <strong style="display: block; font-size : x-small; text-align : center; margin-top: 4px; ">fs-${company.id}-${order.id}-${id}</strong>
+  
+  
+</div>       
             `);
     }
     labelLayout(detail, template) {
         const { products, customer, order } = detail;
         const { orderSummary } = template;
         const { font, fontSize, marginBottom, marginLeft, marginRight, marginTop, showCategoryTitle, showProductKitchenName, width, paper } = template;
-        return (`
-            <div style="font-family : ${font};font-weight : normal;">
-                ${products.map((row) => (`<div>
-                        <div 
-                            style="
-                                display: block;
-                                 min-width: ${this.calculatePaperSize(paper, width)};
-                                 width: ${this.calculatePaperSize(paper, width)};
-                                padding : ${marginTop + "mm"} ${marginRight + "mm"} ${marginBottom + "mm"} ${marginLeft + "mm"};">
-                
+        return (`
+            <div style="font-family : ${font};font-weight : normal;">
+                ${products.map((row) => (`<div>
+                        <div 
+                            style="
+                                display: block;
+                                 min-width: ${this.calculatePaperSize(paper, width)};
+                                 width: ${this.calculatePaperSize(paper, width)};
+                                padding : ${marginTop + "mm"} ${marginRight + "mm"} ${marginBottom + "mm"} ${marginLeft + "mm"};">
+                
                                 ${orderSummary ?
-            `<p style="font-size:${fontSize - 2};">
-                                     #${order.orderNumber}&nbsp;&nbsp;- &nbsp;&nbsp;
-                                      ${order.orderTypeString}
-                                    </p>` : ""}
-                    
+            `<p style="font-size:${fontSize - 2};">
+                                     #${order.orderNumber}&nbsp;&nbsp;- &nbsp;&nbsp;
+                                      ${order.orderTypeString}
+                                    </p>` : ""}
+                    
                                 ${orderSummary ?
-            `<p style="font-size:${fontSize - 4};">
-                                    ${this.weekDayName(order.desiredDate)},&nbsp;
-                                    ${this.formatDate(order.desiredDate)}
-                                    &nbsp;&nbsp;&nbsp;
-                                    ${this.formatAMPMDate(order.desiredDate)}
-                                    </p>` : ""}
-        
-                                <p style="font-size:${fontSize - 2}; border-bottom : ${orderSummary ? "2px" : "0px"} dotted black; padding-bottom : 5px margin-bottom : 5px;">
-                                ${customer.fullName}
-                                </p>
-        
-                
-                                <p style="margin-bottom: 5px; padding-bottom: 5px; border-bottom: 2px solid black;">
-                                    ${row.quantity}X &nbsp;
-                                    ${showCategoryTitle && row.categoryTitle ? "[" + row.categoryTitle.toUpperCase() + "]" : ""}
-                                    ${showProductKitchenName && row.kitchenReceiptName !== "" ? row.kitchenReceiptName : row.title}
-                                    ${row.extrasNames !== "" && `<div>${row.extrasNames}</div>`}
-                                </p>
-                
-                
+            `<p style="font-size:${fontSize - 4};">
+                                    ${this.weekDayName(order.desiredDate)},&nbsp;
+                                    ${this.formatDate(order.desiredDate)}
+                                    &nbsp;&nbsp;&nbsp;
+                                    ${this.formatAMPMDate(order.desiredDate)}
+                                    </p>` : ""}
+        
+                                <p style="font-size:${fontSize - 2}; border-bottom : ${orderSummary ? "2px" : "0px"} dotted black; padding-bottom : 5px margin-bottom : 5px;">
+                                ${customer.fullName}
+                                </p>
+        
+                
+                                <p style="margin-bottom: 5px; padding-bottom: 5px; border-bottom: 2px solid black;">
+                                    ${row.quantity}X &nbsp;
+                                    ${showCategoryTitle && row.categoryTitle ? "[" + row.categoryTitle.toUpperCase() + "]" : ""}
+                                    ${showProductKitchenName && row.kitchenReceiptName !== "" ? row.kitchenReceiptName : row.title}
+                                    ${row.extrasNames !== "" && `<div>${row.extrasNames}</div>`}
+                                </p>
+                
+                
                                 ${row.note !== "" ?
-            `<p  style="margin-bottom: 5px; padding-bottom: 5px; border-bottom: 2px solid black;">
-                                        ${row.note}
-                                    </p>` : ""}
-                
-                        </div>
-        
-                        <div style="clear: both; page-break-after: always;" ></div>
-                    </div>
-                    `)).join("")}
-            </div>
- 
+            `<p  style="margin-bottom: 5px; padding-bottom: 5px; border-bottom: 2px solid black;">
+                                        ${row.note}
+                                    </p>` : ""}
+                
+                        </div>
+        
+                        <div style="clear: both; page-break-after: always;" ></div>
+                    </div>
+                    `)).join("")}
+            </div>
+ 
         `);
     }
     paymentFailed(detail, currency) {
         var _a, _b, _c;
-        return `<div style="padding-top: 16px; padding-bottom: 16px;">
-        <div style="display: flex; flex-direction: row; align-items: center; justify-content: center;">
-            <img alt="" src="https://beta.meemup.com/api/shop/logo/${detail.company.id}"
-                style="width: 100px; min-width: 100px; max-width: 100px; aspect-ratio: auto;">
-        </div>
-        <div
-            style="display: flex; flex-direction: row; align-items: center; justify-content: space-between; margin-left: 10%; margin-right: 10%; margin-top: 16px; padding-left: 16px; padding-right: 16px;">
-            <strong style="font-size: 18px;">AMOUNT</strong>
-            <strong style="font-size: 18px;">${currency} ${detail.order.totalAmount}</strong>
-        </div>
-        <div
-            style="display: flex; flex-direction: row; align-items: center; justify-content: center; border-bottom: 2px solid black; margin-left: 10%; margin-right: 10%; padding: 16px;">
-            <strong style="font-size: 18px; padding-right: 16px;"></strong>
-            <strong style="font-size: 18px;">#0</strong>
-        </div>
-        <div
-            style="display: flex; flex-direction: column; align-items: center; justify-content: center; margin: 16px 10%; border-bottom: 2px solid black;">
-            <strong style="font-size: 18px;">${(_a = detail.paymentInfo) === null || _a === void 0 ? void 0 : _a.state}</strong>
-            <p style="font-size: 12px; font-weight: bold; margin-top: 8px; padding-bottom: 16px;">${(_b = detail.paymentInfo) === null || _b === void 0 ? void 0 : _b.message}</p>
-        </div>
-        <div style="margin-left: 16px; margin-right: 16px;">
-        ${(_c = detail.paymentInfo) === null || _c === void 0 ? void 0 : _c.metadata.map(i => (`<div style="display: flex; flex-direction: row; align-items: center; justify-content: flex-start; margin-bottom: 8px;">
-            <strong style="font-size: 12px; margin-right: 16px;">${i.text}</strong>
-            <strong style="font-size: 12px;">${i.value}</strong>
-        </div>`))}
-            
-        </div>
+        return `<div style="padding-top: 16px; padding-bottom: 16px;">
+        <div style="display: flex; flex-direction: row; align-items: center; justify-content: center;">
+            <img alt="" src="https://beta.meemup.com/api/shop/logo/${detail.company.id}"
+                style="width: 100px; min-width: 100px; max-width: 100px; aspect-ratio: auto;">
+        </div>
+        <div
+            style="display: flex; flex-direction: row; align-items: center; justify-content: space-between; margin-left: 10%; margin-right: 10%; margin-top: 16px; padding-left: 16px; padding-right: 16px;">
+            <strong style="font-size: 18px;">AMOUNT</strong>
+            <strong style="font-size: 18px;">${currency} ${detail.order.totalAmount}</strong>
+        </div>
+        <div
+            style="display: flex; flex-direction: row; align-items: center; justify-content: center; border-bottom: 2px solid black; margin-left: 10%; margin-right: 10%; padding: 16px;">
+            <strong style="font-size: 18px; padding-right: 16px;"></strong>
+            <strong style="font-size: 18px;">#0</strong>
+        </div>
+        <div
+            style="display: flex; flex-direction: column; align-items: center; justify-content: center; margin: 16px 10%; border-bottom: 2px solid black;">
+            <strong style="font-size: 18px;">${(_a = detail.paymentInfo) === null || _a === void 0 ? void 0 : _a.state}</strong>
+            <p style="font-size: 12px; font-weight: bold; margin-top: 8px; padding-bottom: 16px;">${(_b = detail.paymentInfo) === null || _b === void 0 ? void 0 : _b.message}</p>
+        </div>
+        <div style="margin-left: 16px; margin-right: 16px;">
+        ${(_c = detail.paymentInfo) === null || _c === void 0 ? void 0 : _c.metadata.map(i => (`<div style="display: flex; flex-direction: row; align-items: center; justify-content: flex-start; margin-bottom: 8px;">
+            <strong style="font-size: 12px; margin-right: 16px;">${i.text}</strong>
+            <strong style="font-size: 12px;">${i.value}</strong>
+        </div>`))}
+            
+        </div>
     </div>`;
     }
     packageLabel(detail) {
-        return `<div style="padding: 16px;">
-        <div
-            style="display: flex; flex-direction: row; align-items: center; justify-content: space-between; border-bottom: 2px solid black;">
-            <strong style="font-size: 22px;">${detail.order.orderTypeString}</strong>
-            <strong style="font-size: 22px;">${detail.order.orderNumber}</strong>
-        </div>
-        <div style="border-bottom: 2px solid black; padding-top: 8px; padding-bottom: 8px;">
-        ${detail.products.map((i) => (`<strong style="font-size: 16px; padding-top: 2px; padding-bottom: 2px;">${i.quantity}X ${i.title}</strong>`))}
-        </div>
-        <div
-            style="margin-top: 16px; margin-bottom: 16px; padding-bottom: 16px; display: flex; flex-direction: column; align-items: center; justify-content: center; border-bottom: 2px solid black;">
-            <strong style="font-size: 22px;">${detail.order.orderTypeString}</strong>
-            <strong style="font-size: 42px;">${detail.order.orderNumber}</strong>
-            <strong style="font-size: 16px;">${detail.customer.fullName}</strong>
-        </div>
-        <div style="display: flex; flex-direction: column; align-items: center; justify-content: center; margin-top: 16px; margin-left: 10%; margin-right: 10%;">
-            <strong style="font-size: 16px;">${detail.order.desiredDate}</strong>
-            <div style="display: flex; flex-direction: row; align-items: center; justify-content: center; margin-top: 16px;">
-                <img alt="" src="https://beta.meemup.com/api/ordering/${detail.order.id}/${detail.company.id}/QR"
-                    style="width: 100px; min-width: 100px; max-width: 100px; aspect-ratio: auto;">
-            </div>
-        </div>
+        return `<div style="padding: 16px;">
+        <div
+            style="display: flex; flex-direction: row; align-items: center; justify-content: space-between; border-bottom: 2px solid black;">
+            <strong style="font-size: 22px;">${detail.order.orderTypeString}</strong>
+            <strong style="font-size: 22px;">${detail.order.orderNumber}</strong>
+        </div>
+        <div style="border-bottom: 2px solid black; padding-top: 8px; padding-bottom: 8px;">
+        ${detail.products.map((i) => (`<strong style="font-size: 16px; padding-top: 2px; padding-bottom: 2px;">${i.quantity}X ${i.title}</strong>`))}
+        </div>
+        <div
+            style="margin-top: 16px; margin-bottom: 16px; padding-bottom: 16px; display: flex; flex-direction: column; align-items: center; justify-content: center; border-bottom: 2px solid black;">
+            <strong style="font-size: 22px;">${detail.order.orderTypeString}</strong>
+            <strong style="font-size: 42px;">${detail.order.orderNumber}</strong>
+            <strong style="font-size: 16px;">${detail.customer.fullName}</strong>
+        </div>
+        <div style="display: flex; flex-direction: column; align-items: center; justify-content: center; margin-top: 16px; margin-left: 10%; margin-right: 10%;">
+            <strong style="font-size: 16px;">${detail.order.desiredDate}</strong>
+            <div style="display: flex; flex-direction: row; align-items: center; justify-content: center; margin-top: 16px;">
+                <img alt="" src="https://beta.meemup.com/api/ordering/${detail.order.id}/${detail.company.id}/QR"
+                    style="width: 100px; min-width: 100px; max-width: 100px; aspect-ratio: auto;">
+            </div>
+        </div>
     </div>`;
     }
     preview(account, detail, template, symbol = "$") {

package/dist/controllers/ProductModalController.d.ts

@@ -3,34 +3,32 @@ import IExtra from "../interfaces/IExtra";
 import ISelectedExtraItem from "../interfaces/ISelectedExtraItem";
 import ISelectedProductExtra from "../interfaces/ISelectedProductExtra";
 import ITextValue from "../interfaces/ITextValue";
-import IDExtraItem from "../interfaces/database/IDExtraItem";
-import IDExtra from "../interfaces/database/IDExtra";
 import TBaseExtra from "../types/TBaseExtra";
 import IOrderItem from "../interfaces/order/IOrderItem";
-import IDProduct from "../interfaces/database/IDProduct";
 import IProduct from "../interfaces/IProduct";
 import IDProductExtra from "../interfaces/database/IDProductExtra";
+import IExtraItem from "../interfaces/IExtraItem";
 declare const _default: {
     getExtraSelectedItems(list: ISelectedProductExtra[], extraId: number): ISelectedExtraItem[];
-    canAddToBasket(product: IDProduct, selected: ISelectedProductExtra[], extras: IDExtra[]): boolean;
-    productModalToBasketItem(product: IDProduct, selectedExtraList: ISelectedProductExtra[], extras: IDExtra[], count: number, price: number, note: string): IOrderItem;
-    productName(product: IDProduct | IProduct): string;
-    productImage(product: IDProduct | IProduct): string;
-    productPrice(product: IDProduct | IProduct, orderType: EnumOrderType): number;
-    baseItem(list: ISelectedProductExtra[], extraList: IDExtra[]): TBaseExtra;
-    defaultExtraOfProductToSelectedExtras(product: IDProduct, extras: IDExtra[]): ISelectedProductExtra[];
-    defaultExtraOfProductToBasketItem(product: IDProduct, extras: IDExtra[], orderType: EnumOrderType): IOrderItem;
-    singleSelectExtraItemPrice: (extra: IExtra, base: TBaseExtra, item: IDExtraItem) => number;
-    multiSelectExtraPrice: (extra: IDExtra, base: TBaseExtra, item: IDExtraItem, selectedList?: ISelectedExtraItem[]) => number;
-    multiSelectExtraItemOptions(item: IDExtraItem, max: number, selectedList: ISelectedExtraItem[]): ITextValue[];
+    canAddToBasket(product: IProduct, selected: ISelectedProductExtra[], extras: IExtra[]): boolean;
+    productModalToBasketItem(product: IProduct, selectedExtraList: ISelectedProductExtra[], extras: IExtra[], count: number, price: number, note: string): IOrderItem;
+    productName(product: IProduct | IProduct): string;
+    productImage(product: IProduct | IProduct): string;
+    productPrice(product: IProduct | IProduct, orderType: EnumOrderType): number;
+    baseItem(list: ISelectedProductExtra[], extraList: IExtra[]): TBaseExtra;
+    defaultExtraOfProductToSelectedExtras(product: IProduct, extras: IExtra[]): ISelectedProductExtra[];
+    defaultExtraOfProductToBasketItem(product: IProduct, extras: IExtra[], orderType: EnumOrderType): IOrderItem;
+    singleSelectExtraItemPrice: (extra: IExtra, base: TBaseExtra, item: IExtraItem) => number;
+    multiSelectExtraPrice: (extra: IExtra, base: TBaseExtra, item: IExtraItem, selectedList?: ISelectedExtraItem[]) => number;
+    multiSelectExtraItemOptions(item: IExtraItem, max: number, selectedList: ISelectedExtraItem[]): ITextValue[];
     scaleSum(array?: ISelectedExtraItem[]): number;
-    calculatePrice(orderType: EnumOrderType, product: any, list: ISelectedProductExtra[], base: TBaseExtra, extraList: IDExtra[]): number;
+    calculatePrice(orderType: EnumOrderType, product: any, list: ISelectedProductExtra[], base: TBaseExtra, extraList: IExtra[]): number;
     plusString(first: string, second: string): string;
     getValidateExtras(extras: IDProductExtra[], extraSelected: ISelectedProductExtra[]): IDProductExtra[];
-    getProductExtras(pExtras: IDProductExtra[], sExtras: ISelectedProductExtra[], extras: IDExtra[]): IDExtra[];
+    getProductExtras(pExtras: IDProductExtra[], sExtras: ISelectedProductExtra[], extras: IExtra[]): IExtra[];
     quantitySum(array?: ISelectedExtraItem[]): number;
-    productMinAndMaxOptions(product: IDProduct): ITextValue[];
+    productMinAndMaxOptions(product: IProduct): ITextValue[];
     sortByKey(array: any[], key: string, conditionForSort?: boolean): any[];
-    extraItemsSortAction: (a: IDExtraItem, b: IDExtraItem) => 0 | 1 | -1;
+    extraItemsSortAction: (a: IExtraItem, b: IExtraItem) => 0 | 1 | -1;
 };
 export default _default;

package/dist/controllers/ProductModalController.js

@@ -205,7 +205,9 @@ export default new class ProductModalController {
                                 receiptTitle: extraItemModel.receiptTitle,
                                 increasingAmount: extraItemModel.increasingAmount,
                                 increasingPercentage: extraItemModel.increasingPercentage,
-                                tags: extraItemModel.tags
+                                tags: extraItemModel.tags,
+                                extraId: extraItemModel.extraId,
+                                increasingValue: extraItemModel.increasingValue
                             });
                         }
                     });
@@ -246,7 +248,7 @@ export default new class ProductModalController {
         }
         return list;
     }
-    // pizzaSelectExtraPrice = (extra: IDExtra, base: TBaseExtra, item: IDExtraItem, selectedList: ISelectedExtraItem[] = []) => {
+    // pizzaSelectExtraPrice = (extra: IExtra, base: TBaseExtra, item: IExtraItem, selectedList: ISelectedExtraItem[] = []) => {
     //
     //   let _item: ISelectedExtraItem | undefined = selectedList.find(i => i.id === item.id);
     //
@@ -393,7 +395,7 @@ export default new class ProductModalController {
         let se = this.sortByKey(sExtras, "priority", true);
         let pe = this.sortByKey(pExtras, "priority", true);
         let itemsIdList = this.getValidateExtras(pe, se).map(i => i.extraId);
-        // let list: IDExtra[] = extras.filter(i => itemsIdList.includes(+i.id));
+        // let list: IExtra[] = extras.filter(i => itemsIdList.includes(+i.id));
         let result = [];
         itemsIdList.forEach((id) => {
             let ext = extras.find(i => i.id === id);

package/dist/controllers/ZoneController.d.ts

@@ -1,13 +1,13 @@
 import ILocation from "../interfaces/ILocation";
 declare const _default: {
     /**
-    * Performs the even-odd-rule Algorithm (a raycasting algorithm) to find out whether a point is in a given polygon.
-    * This runs in O(n) where n is the number of edges of the polygon.
-    *
-    * @param {ILocation[]} polygon - An array representation of the polygon where polygon[i][0] is the x Value of the i-th point and polygon[i][1] is the y Value.
-    * @param {ILocation} point - An array representation of the point where point[0] is its x Value and point[1] is its y Value.
-    * @returns {boolean} - Whether the point is in the polygon (not on the edge, just turn < into <= and > into >= for that).
-    */
+     * Performs the even-odd-rule Algorithm (a raycasting algorithm) to find out whether a point is in a given polygon.
+     * This runs in O(n) where n is the number of edges of the polygon.
+     *
+     * @param {ILocation[]} polygon - An array representation of the polygon where polygon[i][0] is the x Value of the i-th point and polygon[i][1] is the y Value.
+     * @param {ILocation} point - An array representation of the point where point[0] is its x Value and point[1] is its y Value.
+     * @returns {boolean} - Whether the point is in the polygon (not on the edge, just turn < into <= and > into >= for that).
+     */
     pointInPolygon(polygon: ILocation[], point: ILocation): boolean;
     rad(x: number): number;
     /**

package/dist/controllers/ZoneController.js

@@ -1,13 +1,13 @@
 import MoneyController from "./MoneyController";
 export default new class ZoneController {
     /**
-    * Performs the even-odd-rule Algorithm (a raycasting algorithm) to find out whether a point is in a given polygon.
-    * This runs in O(n) where n is the number of edges of the polygon.
-    *
-    * @param {ILocation[]} polygon - An array representation of the polygon where polygon[i][0] is the x Value of the i-th point and polygon[i][1] is the y Value.
-    * @param {ILocation} point - An array representation of the point where point[0] is its x Value and point[1] is its y Value.
-    * @returns {boolean} - Whether the point is in the polygon (not on the edge, just turn < into <= and > into >= for that).
-    */
+     * Performs the even-odd-rule Algorithm (a raycasting algorithm) to find out whether a point is in a given polygon.
+     * This runs in O(n) where n is the number of edges of the polygon.
+     *
+     * @param {ILocation[]} polygon - An array representation of the polygon where polygon[i][0] is the x Value of the i-th point and polygon[i][1] is the y Value.
+     * @param {ILocation} point - An array representation of the point where point[0] is its x Value and point[1] is its y Value.
+     * @returns {boolean} - Whether the point is in the polygon (not on the edge, just turn < into <= and > into >= for that).
+     */
     pointInPolygon(polygon, point) {
         let odd = false;
         for (let i = 0, j = polygon.length - 1; i < polygon.length; i++) {

package/dist/index.d.ts

@@ -10,6 +10,10 @@ export * from "./controllers/PrintContentController";
 export * from "./controllers/ProductModalController";
 export * from "./controllers/ToolController";
 export * from "./controllers/ZoneController";
+export * from "./controllers/KitchenController";
+export * from "./controllers/CustomerFacingDisplayPacketController";
+export * from "./controllers/ColorController";
+export * from "./controllers/ErrorController";
 export * from "./enums/EnumBasketStep";
 export * from "./enums/EnumCategoryAvailableIn";
 export * from "./enums/EnumChannels";

package/dist/index.js

@@ -10,6 +10,10 @@ export * from "./controllers/PrintContentController";
 export * from "./controllers/ProductModalController";
 export * from "./controllers/ToolController";
 export * from "./controllers/ZoneController";
+export * from "./controllers/KitchenController";
+export * from "./controllers/CustomerFacingDisplayPacketController";
+export * from "./controllers/ColorController";
+export * from "./controllers/ErrorController";
 export * from "./enums/EnumBasketStep";
 export * from "./enums/EnumCategoryAvailableIn";
 export * from "./enums/EnumChannels";

package/dist/interfaces/IExtra.d.ts

@@ -1,5 +1,5 @@
 import IExtraItem from "./IExtraItem";
-interface IExtra {
+export default interface IExtra {
     id: number;
     name: string;
     title: string;
@@ -15,4 +15,4 @@ interface IExtra {
     categoriesCount: number;
     displayingMode: number;
 }
-export default IExtra;
+export declare const initExtra: IExtra;

package/dist/interfaces/IExtra.js

@@ -1 +1,16 @@
-export {};
+export const initExtra = {
+    id: -1,
+    name: "",
+    title: "",
+    maxAllowedItems: 99,
+    required: false,
+    available: true,
+    increasingOtherExtraItemsPrice: false,
+    choosablePizzaToppingsSides: false,
+    numberOfFreeItems: 0,
+    items: [],
+    products: [],
+    productsCount: 0,
+    categoriesCount: 0,
+    displayingMode: 1
+};

package/dist/interfaces/IPointOfSaleLocalSetting.js

@@ -1,6 +1,5 @@
-import { INIT_TERMINAL } from "../statics";
+import { INIT_TERMINAL, UDP_CUSTOMER_MONITOR_PRE_NAME } from "../statics";
 import EnumNewOrderWarning from "../enums/EnumNewOrderWarning";
-import { UDP_CUSTOMER_MONITOR_PRE_NAME } from "../statics";
 import EnumPaymentState from "../enums/EnumPaymentState";
 import EnumNotifyOnlineStoreNewOrder from "../enums/EnumNotifyOnlineStoreNewOrder";
 import EnumPointOfSaleDefaultSaveState from "../enums/EnumPointOfSaleDefaultSaveState";

package/dist/interfaces/IProduct.d.ts

@@ -1,6 +1,7 @@
 import EnumShowCategoryExtras from "../enums/EnumShowCategoryExtras";
 import IAllergicStuffs from "./IAllergicStuffs";
 import IProductExtra from "./IProductExtra";
+import IProductDefaultExtra from "./database/IProductDefaultExtra";
 export default interface IProduct {
     id: number;
     available: boolean;
@@ -45,7 +46,7 @@ export default interface IProduct {
     points: number;
     chosenExtraItemsMode: number;
     extras: IProductExtra[];
-    defaultExtraItems: any[];
+    defaultExtraItems: IProductDefaultExtra[];
     customizable: boolean;
     displayOnKitchenDisplay: boolean;
     menuId: number;

package/dist/interfaces/IProductExtra.d.ts

@@ -1,16 +1,10 @@
 import IExtra from "./IExtra";
-interface IProductExtra {
+import IDProductExtra from "./database/IDProductExtra";
+interface IProductExtra extends IDProductExtra {
     productId: number;
     id: number;
     title: string;
-    extraId: number;
-    availableType: number;
-    showType: number;
-    availableTypeText: string;
-    showTypeText: string;
-    secondExtraId: number | null;
-    secondExtraItemId: number | null;
-    priority: number;
     extra: IExtra;
 }
 export default IProductExtra;
+export declare const initProductExtra: IProductExtra;

package/dist/interfaces/IProductExtra.js

@@ -1 +1,3 @@
-export {};
+import { initExtra } from "./IExtra";
+import { initDProductExtra } from "./database/IDProductExtra";
+export const initProductExtra = Object.assign(Object.assign({}, initDProductExtra), { productId: -1, id: -1, title: "", extra: initExtra });

package/dist/interfaces/ISelectedExtraItem.d.ts

@@ -1,6 +1,6 @@
 import EnumPizzaSide from "../enums/EnumPizzaSide";
-import IDExtraItem from "./database/IDExtraItem";
-interface ISelectedExtraItem extends IDExtraItem {
+import IExtraItem from "./IExtraItem";
+interface ISelectedExtraItem extends IExtraItem {
     quantity: number;
     pizzaSide: EnumPizzaSide;
 }

package/dist/interfaces/ISelectedProductExtra.js

@@ -1,4 +1,2 @@
 import { initDProductExtra } from "./database/IDProductExtra";
-export const initSelectedProductExtra = Object.assign(Object.assign({}, initDProductExtra), { 
-    // subtitle: "",
-    selected: [] });
+export const initSelectedProductExtra = Object.assign(Object.assign({}, initDProductExtra), { selected: [] });

package/dist/interfaces/IStore.d.ts

@@ -5,9 +5,7 @@ import ISystem from "./ISystem";
 import ISetting from "./ISetting";
 import IOrder from "./order/IOrder";
 import IOnlineOrderItem from "./IOnlineOrderItem";
-import IDProduct from "./database/IDProduct";
 import ICategory from "./ICategory";
-import IDExtra from "./database/IDExtra";
 import ICustomer from "./ICustomer";
 import ITextValue from "./ITextValue";
 import ICheckoutOption from "./ICheckoutOption";
@@ -21,6 +19,8 @@ import IOrderState from "./IOrderState";
 import IPaymentStatusChanged from "./IPaymentStatusChanged";
 import IWorkScreen from "./IWorkScreen";
 import IStarMicronicPrinter from "./IStarMicronicPrinter";
+import IExtra from "./IExtra";
+import IProduct from "./IProduct";
 interface IStore {
     account: IAccount;
     orderScreen: IOrderScreenState;
@@ -30,9 +30,9 @@ interface IStore {
     setting: ISetting;
     onlineOrders: IOnlineOrderItem[];
     localOrders: IOrder[];
-    products: IDProduct[];
+    products: IProduct[];
     categories: ICategory[];
-    extras: IDExtra[];
+    extras: IExtra[];
     orders: IOrder[];
     customers: ICustomer[];
     isConnected: boolean;

package/dist/interfaces/database/{IDProductDefaultExtra.d.ts → IProductDefaultExtra.d.ts}

@@ -1,6 +1,6 @@
 import IDProductDefaultExtraItem from "./IDProductDefaultExtraItem";
-interface IDProductDefaultExtra {
+interface IProductDefaultExtra {
     extraId: number;
     items: IDProductDefaultExtraItem[];
 }
-export default IDProductDefaultExtra;
+export default IProductDefaultExtra;

package/dist/types/TBaseExtra.d.ts

@@ -1,4 +1,4 @@
+import IExtra from "../interfaces/IExtra";
 import ISelectedProductExtra from "../interfaces/ISelectedProductExtra";
-import IDExtra from "../interfaces/database/IDExtra";
-type TBaseExtra = [ISelectedProductExtra | undefined, IDExtra | undefined];
+type TBaseExtra = [ISelectedProductExtra | undefined, IExtra | undefined];
 export default TBaseExtra;

package/package.json

@@ -1,29 +1,29 @@
-{
-  "name": "meemup-library",
-  "version": "1.2.6",
-  "description": "",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "build": "yarn remove:one && yarn remove:two && yarn build:esm && yarn build:cjs",
-    "build:esm": "tsc",
-    "build:cjs": "tsc --module commonjs --outDir src/dist",
-    "remove:one": "rimraf dist",
-    "remove:two": "rimraf ./src/dist",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "commit": "git add . && git commit -m \"version.1.2.6\" && git push origin "
-  },
-  "files": [
-    "/dist"
-  ],
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "rimraf": "^5.0.5",
-    "typescript": "^5.2.2"
-  },
-  "dependencies": {
-    "axios": "^1.7.2"
-  }
-}
+{
+  "name": "meemup-library",
+  "version": "1.2.8",
+  "description": "",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "build": "yarn remove:one && yarn remove:two && yarn build:esm && yarn build:cjs",
+    "build:esm": "tsc",
+    "build:cjs": "tsc --module commonjs --outDir src/dist",
+    "remove:one": "rimraf dist",
+    "remove:two": "rimraf ./src/dist",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "commit": "git add . && git commit -m \"version.1.2.8\" && git push origin "
+  },
+  "files": [
+    "/dist"
+  ],
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "rimraf": "^5.0.5",
+    "typescript": "^5.2.2"
+  },
+  "dependencies": {
+    "axios": "^1.7.2"
+  }
+}

package/dist/interfaces/database/IDExtra.d.ts

@@ -1,14 +0,0 @@
-import IDExtraItem from "./IDExtraItem";
-interface IDExtra {
-    id: number;
-    name: string;
-    title: string;
-    maxAllowedItems: number;
-    required: boolean;
-    available: boolean;
-    increasingOtherExtraItemsPrice: boolean;
-    choosablePizzaToppingsSides: boolean;
-    numberOfFreeItems: number;
-    items: IDExtraItem[];
-}
-export default IDExtra;

package/dist/interfaces/database/IDExtraItem.d.ts

@@ -1,18 +0,0 @@
-interface IDExtraItem {
-    id: number;
-    title: string;
-    available: boolean;
-    receiptTitle: string;
-    price: number;
-    priority: number;
-    min: number;
-    max: number;
-    calories: number;
-    increasingPriceType: number;
-    scale: number;
-    isDefaultSelected: boolean;
-    increasingAmount: number;
-    increasingPercentage: number;
-    tags: string[] | null;
-}
-export default IDExtraItem;

package/dist/interfaces/database/IDExtraItem.js

@@ -1 +0,0 @@
-export {};

package/dist/interfaces/database/IDProduct.d.ts

@@ -1,57 +0,0 @@
-import IDProductExtra from "./IDProductExtra";
-import IDProductDefaultExtra from "./IDProductDefaultExtra";
-interface IDProduct {
-    id: number;
-    available: boolean;
-    notAvailableToDate: string | null;
-    displayWhenNotAvailable: boolean;
-    name: string;
-    posName: string;
-    kitchenReceiptName: string;
-    description: string;
-    extrasDescription: string;
-    minOrderQuantity: number;
-    maxOrderQuantity: number;
-    deliveryPrice: number;
-    pickupPrice: number;
-    color: string | null;
-    eanBarcode: string;
-    imageFullPath: string;
-    preperationTime: string;
-    showFromDate: string | null;
-    showFromTime: string | null;
-    showToDate: string | null;
-    showToTime: string | null;
-    vegetarian: boolean;
-    organic: boolean;
-    halal: boolean;
-    spiciness: number;
-    showCategoryExtras: boolean;
-    mainCategoryId: number;
-    allergicStuffs: number[];
-    extras: IDProductExtra[];
-    inMultipleCategories: boolean;
-    categories: number[];
-    containsAlcohol: boolean;
-    vegan: boolean;
-    calories: number;
-    availableIn: number;
-    points: number;
-    chosenExtraItemsMode: number;
-    customizable: boolean;
-    defaultExtraItems: IDProductDefaultExtra[];
-    diningPrice: number;
-    availableForOrdering: number;
-    imageName: string | null;
-    onlyOnWeekDays: number | null;
-    displayOnKitchenDisplay: boolean;
-    menuId: number | null;
-    availableForOrderingType: number;
-    deleted: boolean;
-    allergicStuffsId: number[];
-    showExtrasCategory: number;
-    packagingCosts: number;
-    depositCost: number;
-    thumbnailImage: string | null;
-}
-export default IDProduct;

package/dist/interfaces/database/IDProduct.js

@@ -1 +0,0 @@
-export {};

package/dist/interfaces/database/IDProductDefaultExtra.js

@@ -1 +0,0 @@
-export {};