Merge branch 'main' of github.com:hainatravel/GHHub

src/views/products/Detail/ContractRemarksModal.jsx

@@ -41,9 +41,15 @@ export const ContractRemarksModal = () => {
     getRemarkList()
       .then(list => {
         remarksForm.setFieldsValue({remarkList:list})
+        setRemarksModalOpen(true)
+      })
+      .catch(ex => {
+        notification.error({
+          message: 'Notification',
+          description: ex.message,
+          placement: 'top',
+        })
       })
-
-    setRemarksModalOpen(true)
   }
 
   const getFieldLabel = (field) => {

src/views/products/Print/AgencyContract_v0903.jsx

@@ -162,7 +162,7 @@ const chunkBy = (use_year, dataList = [], by = []) => {
       const matchRange = (ssSets).find((ss) => quoteItem.group_size_min >= ss[0] && quoteItem.group_size_max <= ss[1]);
       const findEnd = matchRange || ssSets.find((ss) => quoteItem.group_size_max > ss[0] && quoteItem.group_size_max <= ss[1] && ss[1] !== Infinity);
       const findStart = findEnd || ssSets.find((ss) => quoteItem.group_size_min >= ss[0]);
-      const finalRange = findStart;
+      const finalRange = findStart || ssSets[0];
       // console.log('find mmm', matchRange, findEnd, findStart, finalRange);
       // console.log('matchRange ', 'find', [quoteItem.group_size_min, quoteItem.group_size_max], 'matched', finalRange);
       // console.groupEnd();