Many syncerkhet

packages/api-plugin-template.erxes/src/index.ts

@@ -704,3 +704,6 @@ async function startServer() {
 }
 
 startServer();
+
+
+// conflict test

packages/erxes-ui/src/brands/containers/SelectBrands.tsx

@@ -22,6 +22,7 @@ export default ({
   initialValue,
   multi = true,
   label,
+  customOption,
   name
 }: {
   queryParams?: IQueryParams;
@@ -46,6 +47,7 @@ export default ({
       generateOptions={generateBrandOptions}
       onSelect={onSelect}
       multi={multi}
+      customOption={customOption}
     />
   );
-};
+};

packages/erxes-ui/src/components/filter/Filter.tsx

@@ -133,7 +133,14 @@ function Filter({ queryParams = {}, filterTitle, history }: IProps) {
       {renderFilterParam('status', false)}
       {renderFilterParam('state', false)}
       {renderFilterParam('categoryApprovalState', false)}
-      {renderFilterWithData('categoryId', 'forum')}
+      {location.href.includes('forum') &&
+        renderFilterWithData('categoryId', 'forum')}
+      {location.href.includes('product') &&
+        renderFilterWithData(
+          'categoryId',
+          'productCategory',
+          '_id, code, name'
+        )}
       {renderFilterParam('participating', true)}
       {renderFilterParam('unassigned', true)}
       {renderFilterParam('awaitingResponse', true, 'Awaiting Response')}

packages/erxes-ui/src/components/filter/createChipText.tsx

@@ -16,6 +16,7 @@ const ChipText = (props: any) => {
   const branch = query.branchDetail;
   const department = query.departmentDetail;
   const unit = query.unitDetail;
+  const productCategory = query.productCategoryDetail;
 
   return (
     (brand && brand.name) ||
@@ -26,7 +27,8 @@ const ChipText = (props: any) => {
     (forum && forum.name) ||
     (branch && branch.title) ||
     (department && department.title) ||
-    (unit && unit.title)
+    (unit && unit.title) ||
+    (productCategory && `${productCategory.code} - ${productCategory.name}`)
   );
 };
 

packages/plugin-pos-api/src/routes.ts

@@ -5,7 +5,8 @@ import { IPosDocument } from './models/definitions/pos';
 import {
   sendCoreMessage,
   sendPricingMessage,
-  sendProductsMessage
+  sendProductsMessage,
+  sendSyncerkhetMessage
 } from './messageBroker';
 import { USER_FIELDS } from './contants';
 
@@ -45,7 +46,7 @@ export const getConfigData = async (subdomain: string, pos: IPosDocument) => {
   }
 
   if (pos.erkhetConfig && pos.erkhetConfig.isSyncErkhet) {
-    const configs = await sendCoreMessage({
+    const configs = await sendSyncerkhetMessage({
       subdomain,
       action: 'getConfig',
       data: { code: 'ERKHET', defaultValue: {} },
@@ -54,7 +55,7 @@ export const getConfigData = async (subdomain: string, pos: IPosDocument) => {
 
     data.pos.erkhetConfig = {
       ...pos.erkhetConfig,
-      getRemainderApiUrl: configs.getRemainderApiUrl,
+      url: process.env.ERKHET_URL,
       apiKey: configs.apiKey,
       apiSecret: configs.apiSecret,
       apiToken: configs.apiToken
@@ -309,7 +310,12 @@ export const unfetchOrderInfo = async (req, res) => {
   const models = await generateModels(subdomain);
 
   const { orderId, token } = req.body;
-  let erkhetConfig = await getConfig(subdomain, 'ERKHET', {});
+  let erkhetConfig = await sendSyncerkhetMessage({
+    subdomain,
+    action: 'getConfig',
+    data: { code: 'ERKHET', defaultValue: {} },
+    isRPC: true
+  });
 
   if (
     !erkhetConfig ||

packages/plugin-posclient-api/src/graphql/utils/products.ts

@@ -14,12 +14,7 @@ export const checkRemainders = async (
 
   if (config.erkhetConfig && config.erkhetConfig.getRemainder) {
     const configs = config.erkhetConfig;
-    if (
-      configs &&
-      configs.getRemainderApiUrl &&
-      configs.apiKey &&
-      configs.apiSecret
-    ) {
+    if (configs && configs.url && configs.apiKey && configs.apiSecret) {
       try {
         let account = configs.account;
         let location = configs.location;
@@ -35,7 +30,8 @@ export const checkRemainders = async (
 
         if (account && location) {
           const response = await sendRequest({
-            url: configs.getRemainderApiUrl,
+            url: `${configs.url ||
+              'https://erkhet.biz'}/get-api/?kind=remainder`,
             method: 'GET',
             params: {
               kind: 'remainder',

packages/plugin-products-api/src/dataloaders/resolvers/queries/products.ts

@@ -21,6 +21,7 @@ interface IQueryParams {
   categoryId?: string;
   searchValue?: string;
   vendorId?: string;
+  brand?: string;
   tag: string;
   page?: number;
   perPage?: number;
@@ -44,6 +45,7 @@ const generateFilter = async (
     categoryId,
     searchValue,
     vendorId,
+    brand,
     tag,
     ids,
     excludeIds,
@@ -131,6 +133,10 @@ const generateFilter = async (
     filter.vendorId = vendorId;
   }
 
+  if (brand) {
+    filter.scopeBrandIds = { $in: [brand] };
+  }
+
   return filter;
 };
 
@@ -140,6 +146,7 @@ const generateFilterCat = async ({
   withChild,
   searchValue,
   meta,
+  brand,
   status
 }) => {
   const filter: any = {};
@@ -170,6 +177,10 @@ const generateFilterCat = async ({
     }
   }
 
+  if (brand) {
+    filter.scopeBrandIds = { $in: [brand] };
+  }
+
   if (meta) {
     if (!isNaN(meta)) {
       filter.meta = { $lte: Number(meta) };
@@ -391,7 +402,7 @@ const productQueries = {
 
   async productCategories(
     _root,
-    { parentId, withChild, searchValue, status, meta },
+    { parentId, withChild, searchValue, status, brand, meta },
     { models }: IContext
   ) {
     const filter = await generateFilterCat({
@@ -400,6 +411,7 @@ const productQueries = {
       parentId,
       withChild,
       searchValue,
+      brand,
       meta
     });
 
@@ -412,7 +424,7 @@ const productQueries = {
 
   async productCategoriesTotalCount(
     _root,
-    { parentId, searchValue, status, withChild, meta },
+    { parentId, searchValue, status, withChild, brand, meta },
     { models }: IContext
   ) {
     const filter = await generateFilterCat({
@@ -421,6 +433,7 @@ const productQueries = {
       withChild,
       searchValue,
       status,
+      brand,
       meta
     });
     return models.ProductCategories.find(filter).countDocuments();

packages/plugin-products-api/src/graphql/schema/product.ts

@@ -35,6 +35,7 @@ export const types = (tagsAvailable, contactsAvailable) => `
     parentId: String
     code: String!
     order: String!
+    scopeBrandIds: [String]
     attachment: Attachment
     status: String
     isRoot: Boolean
@@ -66,6 +67,7 @@ export const types = (tagsAvailable, contactsAvailable) => `
     attachment: Attachment
     attachmentMore: [Attachment]
     vendorId: String
+    scopeBrandIds: [String]
     uom: String
     subUoms: JSON
 
@@ -102,6 +104,7 @@ const productParams = `
   attachment: AttachmentInput,
   attachmentMore: [AttachmentInput],
   vendorId: String,
+  scopeBrandIds: [String]
   uom: String,
   subUoms: JSON,
   taxType: String,
@@ -114,6 +117,7 @@ const productCategoryParams = `
   description: String,
   meta: String,
   parentId: String,
+  scopeBrandIds: [String]
   attachment: AttachmentInput,
   status: String
   maskType: String
@@ -128,6 +132,7 @@ const productsQueryParams = `
   categoryId: String,
   searchValue: String,
   vendorId: String,
+  brand: String
   tag: String,
   ids: [String],
   excludeIds: Boolean,
@@ -139,7 +144,7 @@ const productsQueryParams = `
 `;
 
 export const queries = `
-  productCategories(parentId: String, withChild: Boolean, searchValue: String, status: String, meta: String): [ProductCategory]
+  productCategories(parentId: String, withChild: Boolean, searchValue: String, status: String, meta: String, brand: String): [ProductCategory]
   productCategoriesTotalCount(parentId: String, withChild: Boolean, searchValue: String, status: String, meta: String): Int
   productCategoryDetail(_id: String): ProductCategory
   products(

packages/plugin-products-ui/src/components/product/ProductList.tsx

@@ -299,6 +299,7 @@ class List extends React.Component<IProps, State> {
         header={
           <Wrapper.Header
             title={__('Product & Service')}
+            queryParams={queryParams}
             breadcrumb={breadcrumb}
           />
         }

packages/plugin-products-ui/src/components/productCategory/CategoryList.tsx

@@ -1,23 +1,25 @@
-import { __, router } from '@erxes/ui/src/utils';
+import { router, __ } from '@erxes/ui/src/utils';
 
-import Button from '@erxes/ui/src/components/Button';
 import CategoryForm from '@erxes/ui-products/src/containers/CategoryForm';
-import CategoryStatusFilter from '../product/filters/CategoryStatusFilter';
-import CollapsibleList from '@erxes/ui/src/components/collapsibleList/CollapsibleList';
 import { Header } from '@erxes/ui-settings/src/styles';
-import { IProductCategory } from '../../types';
+import BrandFilter from '@erxes/ui/src/brands/components/BrandFilter';
+import { IBrand } from '@erxes/ui/src/brands/types';
+import Button from '@erxes/ui/src/components/Button';
+import CollapsibleList from '@erxes/ui/src/components/collapsibleList/CollapsibleList';
 import Icon from '@erxes/ui/src/components/Icon';
 import ModalTrigger from '@erxes/ui/src/components/ModalTrigger';
-import ProductTypeFilter from '../product/filters/ProdcutTypeFilter';
-import React from 'react';
-import SegmentFilter from '../product/filters/SegmentFilter';
-import Sidebar from '@erxes/ui/src/layout/components/Sidebar';
-import { SidebarList } from '@erxes/ui/src/layout/styles';
-import TagFilter from '../../containers/TagFilter';
 import Tip from '@erxes/ui/src/components/Tip';
+import Sidebar from '@erxes/ui/src/layout/components/Sidebar';
 import Wrapper from '@erxes/ui/src/layout/components/Wrapper';
+import { SidebarList } from '@erxes/ui/src/layout/styles';
 import { isEnabled } from '@erxes/ui/src/utils/core';
 import { pluginsOfProductCategoryActions } from 'coreui/pluginUtils';
+import React from 'react';
+import TagFilter from '../../containers/TagFilter';
+import { IProductCategory } from '../../types';
+import CategoryStatusFilter from '../product/filters/CategoryStatusFilter';
+import ProductTypeFilter from '../product/filters/ProdcutTypeFilter';
+import SegmentFilter from '../product/filters/SegmentFilter';
 
 const { Section } = Wrapper.Sidebar;
 
@@ -28,6 +30,8 @@ interface IProps {
   productCategories: IProductCategory[];
   productCategoriesCount: number;
   loading: boolean;
+  brands: IBrand[];
+  brandsLoading: boolean;
 }
 
 class List extends React.Component<IProps> {
@@ -141,6 +145,11 @@ class List extends React.Component<IProps> {
         )}
         <CategoryStatusFilter />
         <ProductTypeFilter />
+        <BrandFilter
+          counts={{}}
+          brands={this.props.brands}
+          loading={this.props.brandsLoading}
+        />
         {isEnabled('tags') && <TagFilter />}
       </Sidebar>
     );

packages/plugin-products-ui/src/containers/product/ProductList.tsx

@@ -145,6 +145,7 @@ export default withProps<Props>(
             categoryId: queryParams.categoryId,
             status: queryParams.productStatus,
             tag: queryParams.tag,
+            brand: queryParams.brand,
             searchValue: queryParams.searchValue,
             type: queryParams.type,
             segment: queryParams.segment,