Merge branch 'dev' of https://github.com/erxes/erxes-community into m…

…eeting
erxes · Oct 17, 2023 · 4d35cca · 4d35cca
2 parents 6babaa9 + 89809e6
commit 4d35cca
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 5 deletions.
diff --git a/packages/plugin-pos-api/src/graphql/schema/pos.ts b/packages/plugin-pos-api/src/graphql/schema/pos.ts
@@ -46,6 +46,7 @@ const posCommonFields = `
   allowTypes: [String]
   isCheckRemainder: Boolean
   checkExcludeCategoryIds: [String]
+  banFractions: Boolean
 `;
 
 const catProd = `

diff --git a/packages/plugin-pos-api/src/models/definitions/pos.ts b/packages/plugin-pos-api/src/models/definitions/pos.ts
@@ -39,6 +39,7 @@ export interface IPos {
   allowTypes: string[];
   isCheckRemainder: boolean;
   checkExcludeCategoryIds: string[];
+  banFractions: boolean;
 }
 export interface IPosDocument extends IPos, Document {
   _id: string;
@@ -139,6 +140,7 @@ export const posSchema = schemaHooksWrapper(
       type: [String],
       label: 'Check Exclude Categories'
     }),
+    banFractions: field({ type: Boolean, label: 'has Float count' }),
     status: field({ type: String, label: 'Status', optional: true })
   }),
   'erxes_pos'

diff --git a/packages/plugin-pos-ui/src/pos/components/Pos.tsx b/packages/plugin-pos-ui/src/pos/components/Pos.tsx
@@ -181,7 +181,8 @@ class Pos extends React.Component<Props, State> {
       permissionConfig: pos.permissionConfig || {},
       allowTypes: saveTypes,
       isCheckRemainder: pos.isCheckRemainder,
-      checkExcludeCategoryIds: pos.checkExcludeCategoryIds || []
+      checkExcludeCategoryIds: pos.checkExcludeCategoryIds || [],
+      banFractions: pos.banFractions
     };
 
     if (!pos.isOnline) {

diff --git a/packages/plugin-pos-ui/src/pos/components/step/ConfigStep.tsx b/packages/plugin-pos-ui/src/pos/components/step/ConfigStep.tsx
@@ -40,6 +40,7 @@ type State = {
   kioskExcludeProductIds: string[];
   isCheckRemainder: boolean;
   checkExcludeCategoryIds: string[];
+  banFractions: boolean;
 };
 
 export default class ConfigStep extends React.Component<Props, State> {
@@ -56,7 +57,8 @@ export default class ConfigStep extends React.Component<Props, State> {
       kioskExcludeCategoryIds: (pos && pos.kioskExcludeCategoryIds) || [],
       kioskExcludeProductIds: (pos && pos.kioskExcludeProductIds) || [],
       isCheckRemainder: (pos && pos.isCheckRemainder) || false,
-      checkExcludeCategoryIds: (pos && pos.checkExcludeCategoryIds) || []
+      checkExcludeCategoryIds: (pos && pos.checkExcludeCategoryIds) || [],
+      banFractions: (pos && pos.banFractions) || false
     };
   }
 
@@ -202,7 +204,8 @@ export default class ConfigStep extends React.Component<Props, State> {
       kioskExcludeCategoryIds,
       kioskExcludeProductIds,
       isCheckRemainder,
-      checkExcludeCategoryIds
+      checkExcludeCategoryIds,
+      banFractions
     } = this.state;
 
     const groupTrigger = (
@@ -327,6 +330,19 @@ export default class ConfigStep extends React.Component<Props, State> {
                   multi={true}
                 />
               </FormGroup>
+              <FormGroup>
+                <ControlLabel>Ban Fractions</ControlLabel>
+                <FormControl
+                  checked={banFractions}
+                  componentClass="checkbox"
+                  onChange={e => {
+                    this.onChangeValue(
+                      'banFractions',
+                      (e.target as any).checked
+                    );
+                  }}
+                />
+              </FormGroup>
             </Block>
           </LeftItem>
         </FlexColumn>

diff --git a/packages/plugin-pos-ui/src/pos/components/step/Screens.tsx b/packages/plugin-pos-ui/src/pos/components/step/Screens.tsx
@@ -183,16 +183,39 @@ class ScreensConfig extends React.Component<
     if (pos) {
       kitchenScreen = pos.kitchenScreen || {
         isActive: false,
+        isPrint: false,
         showType: '',
         type: 'time',
         value: 0
       };
     }
 
     if (!kitchenScreen.isActive) {
+      const onChangeSwitchIsPrint = e => {
+        const { pos } = this.props;
+
+        this.props.onChange('pos', {
+          ...pos,
+          kitchenScreen: { ...pos.kitchenScreen, isPrint: e.target.checked }
+        });
+      };
+
       return (
         <FormGroup>
-          <DomainRow></DomainRow>
+          <DomainRow>
+            <ControlLabel>Print</ControlLabel>
+            <Toggle
+              id={'isPrint'}
+              checked={
+                pos && pos.kitchenScreen ? pos.kitchenScreen.isPrint : false
+              }
+              onChange={onChangeSwitchIsPrint}
+              icons={{
+                checked: <span>Yes</span>,
+                unchecked: <span>No</span>
+              }}
+            />
+          </DomainRow>
         </FormGroup>
       );
     }

diff --git a/packages/plugin-pos-ui/src/pos/graphql/mutations.ts b/packages/plugin-pos-ui/src/pos/graphql/mutations.ts
@@ -34,6 +34,7 @@ const commonFields = `
   $allowTypes: [String]
   $isCheckRemainder: Boolean
   $checkExcludeCategoryIds: [String]
+  $banFractions: Boolean
 `;
 
 const commonVariables = `
@@ -70,6 +71,7 @@ const commonVariables = `
   allowTypes: $allowTypes
   isCheckRemainder: $isCheckRemainder
   checkExcludeCategoryIds: $checkExcludeCategoryIds
+  banFractions: $banFractions
 `;
 
 const posAdd = `

diff --git a/packages/plugin-pos-ui/src/pos/graphql/queries.ts b/packages/plugin-pos-ui/src/pos/graphql/queries.ts
@@ -49,6 +49,7 @@ export const posCommonFields = `
   allowTypes
   isCheckRemainder
   checkExcludeCategoryIds
+  banFractions
 
   branchTitle
   departmentTitle

diff --git a/packages/plugin-pos-ui/src/types.ts b/packages/plugin-pos-ui/src/types.ts
@@ -26,6 +26,7 @@ export type IProductGroup = {
 
 export type IScreenConfig = {
   isActive: boolean;
+  isPrint?: boolean;
   type: string;
   value: number;
   contentUrl?: string;
@@ -70,6 +71,7 @@ export type IPos = {
   allowTypes?: string[];
   isCheckRemainder: boolean;
   checkExcludeCategoryIds: string[];
+  banFractions: boolean;
 
   branchTitle?: string;
   departmentTitle?: string;

diff --git a/packages/plugin-posclient-api/src/graphql/schema/configs.ts b/packages/plugin-posclient-api/src/graphql/schema/configs.ts
@@ -75,6 +75,7 @@ export const types = `
     allowTypes: [String]
     isCheckRemainder: Boolean
     checkExcludeCategoryIds: [String]
+    banFractions: Boolean
   }
 `;
 

diff --git a/packages/plugin-posclient-api/src/graphql/utils/syncUtils.ts b/packages/plugin-posclient-api/src/graphql/utils/syncUtils.ts
@@ -290,7 +290,8 @@ export const extractConfig = async (subdomain, doc) => {
     permissionConfig: doc.permissionConfig,
     allowTypes: doc.allowTypes,
     isCheckRemainder: doc.isCheckRemainder,
-    checkExcludeCategoryIds: doc.checkExcludeCategoryIds
+    checkExcludeCategoryIds: doc.checkExcludeCategoryIds,
+    banFractions: doc.banFractions
   };
 };
 

diff --git a/packages/plugin-posclient-api/src/models/definitions/configs.ts b/packages/plugin-posclient-api/src/models/definitions/configs.ts
@@ -75,6 +75,7 @@ export interface IConfig {
   allowTypes: string[];
   isCheckRemainder: boolean;
   checkExcludeCategoryIds: string[];
+  banFractions: boolean;
 }
 
 export interface IConfigDocument extends Document, IConfig {
@@ -164,6 +165,7 @@ export const configSchema = new Schema({
   allowTypes: field({ type: [String], label: 'Allow Types' }),
   isCheckRemainder: field({ type: Boolean, optional: true }),
   checkExcludeCategoryIds: field({ type: [String] }),
+  banFractions: field({ type: Boolean, optional: true }),
   status: field({ type: String, optional: true })
 });