Merge pull request #1294 from Gadha2311/item-enquiry-list

feat : item enquiry

models/baseModels/AccountingSettings/AccountingSettings.ts

@@ -23,6 +23,7 @@ export class AccountingSettings extends Doc {
   enableInvoiceReturns?: boolean;
   enableLoyaltyProgram?: boolean;
   enablePricingRule?: boolean;
+  enaenableItemEnquiry?: boolean;
   enableERPNextSync?: boolean;
   enablePointOfSaleWithOutInventory?: boolean;
   enablePartialPayment?: boolean;

models/baseModels/ItemEnquiry/ItemEnquiry.ts

@@ -0,0 +1,16 @@
+import { Doc } from 'fyo/model/doc';
+import { ListViewSettings } from 'fyo/model/types';
+
+export class ItemEnquiry extends Doc {
+  item?: string;
+  customer?: string;
+  contact?: string;
+  description?: string;
+  similarProduct?: string;
+
+  static override getListViewSettings(): ListViewSettings {
+    return {
+      columns: ['item', 'customer', 'contact', 'description', 'similarProduct'],
+    };
+  }
+}

models/index.ts

@@ -57,6 +57,7 @@ import { ERPNextSyncSettings } from './baseModels/ERPNextSyncSettings/ERPNextSyn
 import { ERPNextSyncQueue } from './baseModels/ERPNextSyncQueue/ERPNextSyncQueue';
 import { FetchFromERPNextQueue } from './baseModels/FetchFromERPNextQueue/FetchFromERPNextQueue';
 import { IntegrationErrorLog } from './baseModels/IntegrationErrorLog/IntegrationErrorLog';
+import { ItemEnquiry } from './baseModels/ItemEnquiry/ItemEnquiry';
 
 export const models = {
   Account,
@@ -67,6 +68,7 @@ export const models = {
   Defaults,
   Item,
   ItemGroup,
+  ItemEnquiry,
   JournalEntry,
   JournalEntryAccount,
   Misc,

models/types.ts

@@ -21,6 +21,7 @@ export enum ModelNameEnum {
   Defaults = 'Defaults',
   Item = 'Item',
   ItemGroup = 'ItemGroup',
+  ItemEnquiry = 'ItemEnquiry',
   UOM = 'UOM',
   UOMConversionItem = 'UOMConversionItem',
   JournalEntry = 'JournalEntry',

schemas/app/AccountingSettings.json

@@ -121,6 +121,13 @@
       "default": false,
       "section": "Features"
     },
+    {
+      "fieldname": "enableItemEnquiry",
+      "label": "Enable Item Enquiry",
+      "fieldtype": "Check",
+      "default": false,
+      "section": "Features"
+    },
     {
       "fieldname": "enableLoyaltyProgram",
       "label": "Enable Loyalty Program",

schemas/app/ItemEnquiry.json

@@ -0,0 +1,41 @@
+{
+  "name": "ItemEnquiry",
+  "label": "Item Enquiry",
+  "create": false,
+  "isSingle": false,
+  "isChild": false,
+  "naming": "autoincrement",
+  "fields": [
+    {
+      "fieldname": "item",
+      "label": "Item",
+      "fieldtype": "Data",
+      "required": true,
+      "section": "Default"
+    },
+    {
+      "fieldname": "customer",
+      "label": "Customer",
+      "fieldtype": "Data",
+      "section": "Default"
+    },
+    {
+      "fieldname": "contact",
+      "label": "Contact",
+      "fieldtype": "Data",
+      "section": "Default"
+    },
+    {
+      "fieldname": "description",
+      "label": "Description",
+      "fieldtype": "Text",
+      "section": "Default"
+    },
+    {
+      "fieldname": "similarProduct",
+      "label": "Similar Product",
+      "fieldtype": "Data",
+      "section": "Default"
+    }
+  ]
+}

schemas/schemas.ts

@@ -81,6 +81,7 @@ import FetchFromERPNextQueue from './app/FetchFromERPNextQueue.json';
 import IntegrationErrorLog from './app/IntegrationErrorLog.json';
 import ItemGroup from './app/ItemGroup.json';
 import { Schema, SchemaStub } from './types';
+import ItemEnquiry from './app/ItemEnquiry.json';
 
 export const coreSchemas: Schema[] = [
   PatchRun as Schema,
@@ -132,6 +133,7 @@ export const appSchemas: Schema[] | SchemaStub[] = [
   JournalEntryAccount as Schema,
 
   Invoice as Schema,
+  ItemEnquiry as Schema,
   SalesInvoice as Schema,
   PurchaseInvoice as Schema,
   SalesQuote as Schema,

src/components/Controls/AutoComplete.vue

@@ -128,6 +128,7 @@ export default {
       isLoading: false,
       suggestions: [],
       highlightedIndex: -1,
+      isFocused: false,
     };
   },
   computed: {
@@ -289,12 +290,14 @@ export default {
       this.toggleDropdown(false);
     },
     onFocus(e, toggleDropdown) {
+      this.isFocused = true;
       this.toggleDropdown = toggleDropdown;
       this.toggleDropdown(true);
       this.updateSuggestions();
       this.$emit('focus', e);
     },
     async onBlur(label) {
+      this.isFocused = false;
       if (!label && !this.value) {
         return;
       }

src/components/Controls/Link.vue

@@ -109,7 +109,7 @@ export default {
               actionOnly: true,
             },
           ];
-        } else if (!this.doc || !this.df.create) {
+        } else if (this.isFocused && (!this.doc || !this.df.create)) {
           options = [
             {
               component: markRaw({

src/components/POS/types.ts

@@ -19,6 +19,7 @@ export const modalNames = [
   'Alert',
   'CouponCode',
   'PriceList',
+  'ItemEnquiry',
   'ReturnSalesInvoice',
 ] as const;
 

src/pages/POS/ClassicPOS.vue

@@ -40,6 +40,11 @@
       @toggle-modal="emitEvent('toggleModal', 'PriceList')"
     />
 
+    <ItemEnquiryModal
+      :open-modal="openItemEnquiryModal"
+      @toggle-modal="emitEvent('toggleModal', 'ItemEnquiry')"
+    />
+
     <PaymentModal
       :open-modal="openPaymentModal"
       @toggle-modal="emitEvent('toggleModal', 'Payment')"
@@ -372,6 +377,7 @@ import PaymentModal from './PaymentModal.vue';
 import Button from 'src/components/Button.vue';
 import { defineComponent, PropType } from 'vue';
 import PriceListModal from './PriceListModal.vue';
+import ItemEnquiryModal from './ItemEnquiryModal.vue';
 import { Item } from 'models/baseModels/Item/Item';
 import CouponCodeModal from './CouponCodeModal.vue';
 import POSQuickActions from './POSQuickActions.vue';
@@ -404,6 +410,7 @@ export default defineComponent({
     PaymentModal,
     MultiLabelLink,
     PriceListModal,
+    ItemEnquiryModal,
     CouponCodeModal,
     POSQuickActions,
     OpenPOSShiftModal,
@@ -424,6 +431,7 @@ export default defineComponent({
     disablePayButton: Boolean,
     openPaymentModal: Boolean,
     openPriceListModal: Boolean,
+    openItemEnquiryModal: Boolean,
     openCouponCodeModal: Boolean,
     openShiftCloseModal: Boolean,
     openSavedInvoiceModal: Boolean,

src/pages/POS/ItemEnquiryModal.vue

@@ -0,0 +1,169 @@
+<template>
+  <Modal class="h-auto w-96" :set-close-listener="false">
+    <p class="text-center font-semibold py-3">{{ t`Item Enquiry` }}</p>
+    <div class="px-10">
+      <hr class="dark:border-gray-800" />
+      <div class="flex flex-col gap-5 pt-8">
+        <Link
+          :df="{
+            fieldname: 'item',
+            fieldtype: 'Link',
+            target: 'Item',
+            label: t`Item`,
+            required: true,
+          }"
+          :value="ItemEnquiry.item"
+          :border="true"
+          :show-label="true"
+          @change="(value: string) => ItemEnquiry.item = value"
+        />
+
+        <Text
+          :df="{
+            fieldname: 'description',
+            fieldtype: 'Text',
+            label: t`Description`,
+          }"
+          :value="ItemEnquiry.description"
+          :border="true"
+          :show-label="true"
+          @change="(value: string) => ItemEnquiry.description = value"
+        />
+
+        <Link
+          :df="{
+            fieldname: 'customer',
+            fieldtype: 'Link',
+            target: 'Party',
+            label: t`Customer`,
+          }"
+          :value="ItemEnquiry.customer"
+          :border="true"
+          :show-label="true"
+          @change="(value: string) => {
+      ItemEnquiry.customer = value;
+      updateCustomerContact(value);
+    }"
+        />
+
+        <Data
+          :df="{
+            fieldname: 'contact',
+            fieldtype: 'Data',
+            label: t`Contact`,
+          }"
+          :value="ItemEnquiry.contact"
+          :border="true"
+          :show-label="true"
+          @change="(value: string) => ItemEnquiry.contact = value"
+        />
+
+        <Link
+          :df="{
+            fieldname: 'similarProduct',
+            fieldtype: 'Link',
+            target: 'Item',
+            label: t`Similar Product`,
+          }"
+          :value="ItemEnquiry.similarProduct"
+          :border="true"
+          :show-label="true"
+          @change="(value: string) => ItemEnquiry.similarProduct = value"
+        />
+      </div>
+
+      <div class="grid grid-cols-2 gap-4 mt-10 mb-4">
+        <div class="col-span-2">
+          <Button
+            class="w-full bg-green-500 dark:bg-green-700"
+            style="padding: 1.35rem"
+            @click="submitForm"
+          >
+            <slot>
+              <p class="uppercase text-lg text-white font-semibold">
+                {{ t`Submit` }}
+              </p>
+            </slot>
+          </Button>
+        </div>
+      </div>
+
+      <div class="grid grid-cols-2 gap-4 mb-6">
+        <div class="col-span-2">
+          <Button
+            class="w-full bg-red-500 dark:bg-red-700"
+            style="padding: 1.35rem"
+            @click="closeModal"
+          >
+            <slot>
+              <p class="uppercase text-lg text-white font-semibold">
+                {{ t`Cancel` }}
+              </p>
+            </slot>
+          </Button>
+        </div>
+      </div>
+    </div>
+  </Modal>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { t } from 'fyo';
+import { showToast } from 'src/utils/interactive';
+import Modal from 'src/components/Modal.vue';
+import Button from 'src/components/Button.vue';
+import Link from 'src/components/Controls/Link.vue';
+import Text from 'src/components/Controls/Text.vue';
+import Data from 'src/components/Controls/Data.vue';
+import { ItemEnquiry } from 'models/baseModels/ItemEnquiry/ItemEnquiry';
+import { ModelNameEnum } from 'models/types';
+import { DocValueMap } from 'fyo/core/types';
+
+export default defineComponent({
+  name: 'ItemEnquiryModal',
+  components: {
+    Modal,
+    Button,
+    Link,
+    Text,
+    Data,
+  },
+  emits: ['toggleModal'],
+  data() {
+    return {
+      ItemEnquiry: {} as ItemEnquiry,
+    };
+  },
+  methods: {
+    async updateCustomerContact(customer: string) {
+      this.ItemEnquiry.contact =
+        ((await this.fyo.getValue('Party', customer, 'phone')) as string) || '';
+    },
+
+    async submitForm() {
+      try {
+        const itemEnquiryDoc = this.fyo.doc.getNewDoc(
+          ModelNameEnum.ItemEnquiry,
+          this.ItemEnquiry as DocValueMap
+        );
+        await itemEnquiryDoc.sync();
+        showToast({
+          type: 'success',
+          message: t`Item enquiry submitted`,
+        });
+        this.$emit('toggleModal', 'ItemEnquiry');
+      } catch (error) {
+        showToast({
+          type: 'error',
+          message: t`${error as string}`,
+        });
+      }
+    },
+
+    closeModal() {
+      this.$emit('toggleModal', 'ItemEnquiry');
+    },
+  },
+});
+</script>

src/pages/POS/POS.vue

@@ -32,6 +32,7 @@
       :item-discounts="(itemDiscounts as Money)"
       :coupons="(coupons as AppliedCouponCodes)"
       :open-price-list-modal="openPriceListModal"
+      :open-item-enquiry-modal="openItemEnquiryModal"
       :applied-coupons-count="appliedCouponsCount"
       :open-shift-close-modal="openShiftCloseModal"
       :open-coupon-code-modal="openCouponCodeModal"
@@ -203,6 +204,7 @@ export default defineComponent({
       openPaymentModal: false,
       openKeyboardModal: false,
       openPriceListModal: false,
+      openItemEnquiryModal: false,
       openCouponCodeModal: false,
       openShiftCloseModal: false,
       openSavedInvoiceModal: false,

src/pages/POS/POSQuickActions.vue

@@ -296,6 +296,53 @@
       Price List
     </span>
   </div>
+  <div
+    class="relative group"
+    :class="{
+      hidden: !fyo.singles.AccountingSettings?.enableItemEnquiry,
+    }"
+  >
+    <div
+      class="p-1 rounded-md bg-gray-100"
+      @click="$emit('toggleModal', 'ItemEnquiry')"
+    >
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        height="23px"
+        viewBox="0 -960 960 960"
+        width="24px"
+        fill="#000"
+      >
+        <path
+          d="M180.31-164q-27.01 0-45.66-18.65Q116-201.3 116-228.31v-503.38q0-27.01 18.65-45.66Q153.3-796 180.31-796h599.38q27.01 0 45.66 18.65Q844-758.7 844-731.69v503.38q0 27.01-18.65 45.66Q806.7-164 779.69-164H180.31Zm0-52h599.38q4.62 0 8.46-3.85 3.85-3.84 3.85-8.46v-503.38q0-4.62-3.85-8.46-3.84-3.85-8.46-3.85H180.31q-4.62 0-8.46 3.85-3.85 3.84-3.85 8.46v503.38q0 4.62 3.85 8.46 3.84 3.85 8.46 3.85ZM221-297h172v-52H221v52Zm361-77.23L737.77-530 701-566.77l-119 119-51-51L494.23-462 582-374.23ZM221-454h172v-52H221v52Zm0-156h172v-52H221v52Zm-53 394v-528 528Z"
+        />
+      </svg>
+    </div>
+
+    <span
+      class="
+        absolute
+        bottom-full
+        left-1/2
+        transform
+        -translate-x-1/2
+        mb-2
+        bg-gray-100
+        dark:bg-gray-800 dark:text-white
+        text-black text-xs
+        rounded-md
+        p-2
+        w-28
+        text-center
+        opacity-0
+        group-hover:opacity-100
+        transition-opacity
+        duration-300
+      "
+    >
+      Item Enquiry
+    </span>
+  </div>
 </template>
 
 <script lang="ts">