@licklist/design 0.44.485-dev.46 → 0.44.485-dev.47

package/dist/sales/booking/filter/components/AdditionalFIlterSection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdditionalFIlterSection.d.ts","sourceRoot":"","sources":["../../../../../src/sales/booking/filter/components/AdditionalFIlterSection.tsx"],"names":[],"mappings":";AAsBA,MAAM,MAAM,4BAA4B,GAAG;IACzC,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;IACjC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,IAAI,CAAC;IACrC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,uBAAuB,mBAgEnC,CAAC"}
+{"version":3,"file":"AdditionalFIlterSection.d.ts","sourceRoot":"","sources":["../../../../../src/sales/booking/filter/components/AdditionalFIlterSection.tsx"],"names":[],"mappings":";AAuBA,MAAM,MAAM,4BAA4B,GAAG;IACzC,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;IACjC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,IAAI,CAAC;IACrC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,uBAAuB,mBA6EnC,CAAC"}

package/dist/sales/booking/filter/components/AdditionalFIlterSection.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,t=require("tslib"),r=require("react"),l=(e=r)&&"object"==typeof e&&"default"in e?e.default:e,n=require("react-i18next"),o=require("react-bootstrap"),a=require("react-hook-form"),i=require("@licklist/core/dist/DataMapper/Order/OrderDataMapper"),s=require("@licklist/plugins/dist/context/booking/BookingContext"),c=[i.ORDER_STATUS_PENDING,i.ORDER_STATUS_CANCELLED,i.ORDER_STATUS_COMPLETED,i.ORDER_STATUS_ACTION_REQUIRED];exports.AdditionalFilterSection=function(){var e=n.useTranslation("Design").t,i=r.useContext(s.BookingContext),m=i.filters,u=i.setFilters,E=a.useForm({defaultValues:m}),d=E.handleSubmit,p=E.register,f=E.reset;return r.useEffect((function(){f(m)}),[m,f]),l.createElement("div",{className:"additional-filter-section"},l.createElement(o.Form,{onSubmit:d((function(e){u(e)}))},l.createElement(o.Row,null,l.createElement(o.Col,{md:"3"},l.createElement(o.Form.Group,null,l.createElement(o.Form.Label,null,e("staffMember")),l.createElement(o.Form.Control,t.__assign({},p("staffMember"),{as:"select"}),l.createElement("option",{value:""},e("Design:choose"))))),l.createElement(o.Col,{md:"3"},l.createElement(o.Form.Group,null,l.createElement(o.Form.Label,null,e("bookingStatus")),l.createElement(o.Form.Control,t.__assign({},p("status"),{as:"select"}),l.createElement("option",{value:""},e("Design:choose")),Object.keys(c).map((function(t){return l.createElement("option",{key:c[t],value:c[t]},e("Design:".concat(c[t])))}))))),l.createElement(o.Col,{md:"3"},l.createElement(o.Form.Group,null,l.createElement(o.Form.Label,null,e("date")),l.createElement(o.Form.Control,t.__assign({},p("date"),{type:"date"})))),l.createElement(o.Col,{md:"3",className:"d-flex align-items-end"},l.createElement(o.Form.Group,null,l.createElement(o.Button,{type:"submit",className:"shadow-none"},e("apply")))))))};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,t=require("tslib"),r=require("react"),a=(e=r)&&"object"==typeof e&&"default"in e?e.default:e,n=require("react-i18next"),o=require("react-bootstrap"),l=require("react-hook-form"),i=require("../../../../static/date-range-input/DateRangeInput.js"),s=require("@licklist/core/dist/DataMapper/Order/OrderDataMapper"),c=require("@licklist/plugins/dist/context/booking/BookingContext"),u=[s.ORDER_STATUS_PENDING,s.ORDER_STATUS_CANCELLED,s.ORDER_STATUS_COMPLETED,s.ORDER_STATUS_ACTION_REQUIRED];exports.AdditionalFilterSection=function(){var e=n.useTranslation("Design").t,s=r.useContext(c.BookingContext),m=s.filters,d=s.setFilters,E=l.useForm({defaultValues:m}),p=E.handleSubmit,_=E.register,f=E.setValue,D=E.reset,g=E.watch,b=g("order_date_from"),C=g("order_date_to");return r.useEffect((function(){D(m)}),[m,D]),a.createElement("div",{className:"additional-filter-section"},a.createElement(o.Form,{onSubmit:p((function(e){d(e)}))},a.createElement(o.Row,null,a.createElement(o.Col,{md:"3"},a.createElement(o.Form.Group,null,a.createElement(o.Form.Label,null,e("staffMember")),a.createElement(o.Form.Control,t.__assign({},_("staffMember"),{as:"select"}),a.createElement("option",{value:""},e("Design:choose"))))),a.createElement(o.Col,{md:"3"},a.createElement(o.Form.Group,null,a.createElement(o.Form.Label,null,e("bookingStatus")),a.createElement(o.Form.Control,t.__assign({},_("status"),{as:"select"}),a.createElement("option",{value:""},e("Design:choose")),Object.keys(u).map((function(t){return a.createElement("option",{key:u[t],value:u[t]},e("Design:".concat(u[t])))}))))),a.createElement(o.Col,{md:"3"},a.createElement(o.Form.Group,null,a.createElement(o.Form.Label,null,e("date")),a.createElement(i.DateRangeInput,{placeholder:e("date"),startDate:b,endDate:C,onDateChange:function(e){var t=e.startDate,r=e.endDate;f("order_date_from",t),f("order_date_to",r)}}))),a.createElement(o.Col,{md:"3",className:"d-flex align-items-end"},a.createElement(o.Form.Group,null,a.createElement(o.Button,{type:"submit",className:"shadow-none"},e("apply")))))))};

package/dist/sales/booking/filter/components/SearchingForSection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SearchingForSection.d.ts","sourceRoot":"","sources":["../../../../../src/sales/booking/filter/components/SearchingForSection.tsx"],"names":[],"mappings":";AAWA,eAAO,MAAM,mBAAmB,mBAwD/B,CAAC"}
+{"version":3,"file":"SearchingForSection.d.ts","sourceRoot":"","sources":["../../../../../src/sales/booking/filter/components/SearchingForSection.tsx"],"names":[],"mappings":";AAgBA,eAAO,MAAM,mBAAmB,mBAoE/B,CAAC"}

package/dist/sales/booking/filter/components/SearchingForSection.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,t=require("tslib"),r=require("react"),n=(e=r)&&"object"==typeof e&&"default"in e?e.default:e,a=require("react-i18next"),s=require("react-bootstrap"),i=require("@licklist/plugins/dist/context/booking/BookingContext"),c=require("./ResultTagButton.js"),o=["q","status","date","staffMember"];exports.SearchingForSection=function(){var e=a.useTranslation("Design").t,u=r.useContext(i.BookingContext),l=u.filters,g=u.setFilters,m=r.useMemo((function(){return o.reduce((function(e,r){var n;return l[r]?t.__assign(t.__assign({},e),((n={})[r]=l[r],n)):e}),{})}),[l]),f=function(e){var r;g(t.__assign(t.__assign({},l),((r={})[e]="",r)))};if(!Object.keys(m).length)return null;var _=m.search,p=t.__rest(m,["search"]);return n.createElement("div",{className:"searching-for-section"},n.createElement("div",{className:"tags"},n.createElement("p",{className:"label"},e("Design:searchingFor"),":"),n.createElement("p",{className:"search-query-param"},_),Object.keys(p).map((function(e){return n.createElement(c.ResultTagButton,{key:e,tagKey:e,value:p[e],onRemoveClick:f})})),n.createElement(s.Button,{variant:"link",className:"shadow-none",onClick:function(){g({isFilterOpen:!0})}},e("clear"))))};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,t=require("tslib"),r=require("react"),a=(e=r)&&"object"==typeof e&&"default"in e?e.default:e,n=require("react-i18next"),s=require("react-bootstrap"),o=require("@licklist/plugins/dist/context/booking/BookingContext"),i=require("./ResultTagButton.js"),c=["q","status","order_date_from","staffMember"];exports.SearchingForSection=function(){var e=n.useTranslation("Design").t,l=r.useContext(o.BookingContext),u=l.filters,_=l.setFilters,d=r.useMemo((function(){return c.reduce((function(e,r){var a,n;return"order_date_from"===r&&u[r]?t.__assign(t.__assign({},e),((a={})[r]="".concat(u.order_date_from||""," - ").concat((null==u?void 0:u.order_date_to)||""),a)):u[r]?t.__assign(t.__assign({},e),((n={})[r]=u[r],n)):e}),{})}),[u]),g=function(e){var r;_("order_date_from"!==e?t.__assign(t.__assign({},u),((r={})[e]="",r)):t.__assign(t.__assign({},u),{order_date_from:"",order_date_to:""}))};if(!Object.keys(d).length)return null;var m=d.search,f=t.__rest(d,["search"]);return a.createElement("div",{className:"searching-for-section"},a.createElement("div",{className:"tags"},a.createElement("p",{className:"label"},e("Design:searchingFor"),":"),a.createElement("p",{className:"search-query-param"},m),Object.keys(f).map((function(e){return a.createElement(i.ResultTagButton,{key:e,tagKey:e,value:f[e],onRemoveClick:g})})),a.createElement(s.Button,{variant:"link",className:"shadow-none",onClick:function(){_({isFilterOpen:!0})}},e("clear"))))};

package/dist/sales/filters/SaleFilters.d.ts

@@ -7,7 +7,7 @@ export interface Filters {
     order_date_to: string;
     orderable_date_from: string;
     orderable_date_to: string;
-    is_pending: boolean;
+    is_in_cart: boolean;
 }
 export interface SaleFiltersProps {
     values: Filters;

package/dist/table/FilterHelperComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterHelperComponent.d.ts","sourceRoot":"","sources":["../../src/table/FilterHelperComponent.tsx"],"names":[],"mappings":";AAIA,MAAM,WAAW,0BAA0B;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAED;;;;GAIG;AACH,iBAAS,qBAAqB,CAAC,EAC7B,YAAY,EACZ,SAAS,GACV,EAAE,0BAA0B,eAiE5B;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAC"}
+{"version":3,"file":"FilterHelperComponent.d.ts","sourceRoot":"","sources":["../../src/table/FilterHelperComponent.tsx"],"names":[],"mappings":";AAIA,MAAM,WAAW,0BAA0B;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAED;;;;GAIG;AACH,iBAAS,qBAAqB,CAAC,EAC7B,YAAY,EACZ,SAAS,GACV,EAAE,0BAA0B,eAkE5B;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAC"}

package/dist/table/FilterHelperComponent.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,t=require("tslib"),n=require("react"),l=(e=n)&&"object"==typeof e&&"default"in e?e.default:e,r=require("react-i18next"),a=require("react-bootstrap");exports.FilterHelperComponent=function(e){var i=e.defaultValue,c=e.onClickFn,o=t.__read(n.useState(null!=i?i:""),2),s=o[0],u=o[1],f=r.useTranslation(["Design"]).t;n.useEffect((function(){u(null!=i?i:"")}),[i]);var m=function(){c&&c(s)};return l.createElement(l.Fragment,null,l.createElement("div",{className:"filter"},l.createElement("label",{htmlFor:"filter"},l.createElement("div",{className:"d-flex flex-row align-items-center"},l.createElement(a.FormControl,{id:"filter",name:"filter",placeholder:f("Design:search"),type:"text",value:s,onChange:function(e){var t=e.target.value;u((function(){return t}))},onKeyDown:function(e){"Enter"===e.key&&m()}}),l.createElement(a.Button,{variant:"secondary",className:"d-flex align-items-center align-self-end ml-2",onClick:function(){c&&c("")}},f("Design:clear")),l.createElement(a.Button,{type:"submit",className:"d-flex align-items-center align-self-end ml-2",onClick:m},f("Design:search"))))))};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,t=require("tslib"),n=require("react"),l=(e=n)&&"object"==typeof e&&"default"in e?e.default:e,r=require("react-i18next"),a=require("react-bootstrap");exports.FilterHelperComponent=function(e){var i=e.defaultValue,c=e.onClickFn,o=t.__read(n.useState(null!=i?i:""),2),s=o[0],u=o[1],f=r.useTranslation(["Design"]).t;n.useEffect((function(){u(null!=i?i:"")}),[i]);var m=function(){c&&c(s)};return l.createElement(l.Fragment,null,l.createElement("div",{className:"filter"},l.createElement("label",{htmlFor:"filter"},l.createElement("div",{className:"d-flex flex-row align-items-center"},l.createElement(a.FormControl,{id:"filter",name:"filter",placeholder:f("Design:search"),type:"text",value:s,onChange:function(e){var t=e.target.value;u((function(){return t}))},onKeyDown:function(e){"Enter"===e.key&&m()}}),l.createElement(a.Button,{variant:"secondary",className:"d-flex align-items-center align-self-end ml-2",onClick:function(){c&&c(""),u("")}},f("Design:clear")),l.createElement(a.Button,{type:"submit",className:"d-flex align-items-center align-self-end ml-2",onClick:m},f("Design:search"))))))};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.44.485-dev.46",
+  "version": "0.44.485-dev.47",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"

package/src/sales/booking/filter/components/AdditionalFIlterSection.tsx

@@ -12,6 +12,7 @@ import {
   BookingContext,
   BookingFilters,
 } from "@licklist/plugins/dist/context/booking/BookingContext";
+import { DateRangeInput } from "../../../../static/date-range-input/DateRangeInput";
 
 const ORDER_STATUSES_FOR_UPDATE = [
   ORDER_STATUS_PENDING,
@@ -32,10 +33,15 @@ export const AdditionalFilterSection = () => {
   const { t } = useTranslation("Design");
   const { filters, setFilters } = useContext(BookingContext);
 
-  const { handleSubmit, register, reset } = useForm<Partial<BookingFilters>>({
+  const { handleSubmit, register, setValue, reset, watch } = useForm<
+    Partial<BookingFilters>
+  >({
     defaultValues: filters,
   });
 
+  const startDate = watch("order_date_from");
+  const endDate = watch("order_date_to");
+
   const onFormSubmit = (values: Partial<BookingFilters>) => {
     setFilters(values);
   };
@@ -77,7 +83,15 @@ export const AdditionalFilterSection = () => {
           <Col md="3">
             <Form.Group>
               <Form.Label>{t("date")}</Form.Label>
-              <Form.Control {...register("date")} type="date" />
+              <DateRangeInput
+                placeholder={t("date")}
+                startDate={startDate}
+                endDate={endDate}
+                onDateChange={({ startDate, endDate }) => {
+                  setValue("order_date_from", startDate);
+                  setValue("order_date_to", endDate);
+                }}
+              />
             </Form.Group>
           </Col>
 

package/src/sales/booking/filter/components/SearchingForSection.tsx

@@ -7,7 +7,12 @@ import {
 } from "@licklist/plugins/dist/context/booking/BookingContext";
 import { ResultTagButton } from "./ResultTagButton";
 
-const SEARCHING_FOR_FILTER_KEYS = ["q", "status", "date", "staffMember"];
+const SEARCHING_FOR_FILTER_KEYS = [
+  "q",
+  "status",
+  "order_date_from",
+  "staffMember",
+];
 
 export const SearchingForSection = () => {
   const { t } = useTranslation("Design");
@@ -16,6 +21,14 @@ export const SearchingForSection = () => {
   const filteredFilters = useMemo(() => {
     return SEARCHING_FOR_FILTER_KEYS.reduce(
       (prevValues: Partial<BookingFilters>, currentKey: string) => {
+        if (currentKey === "order_date_from" && filters[currentKey]) {
+          return {
+            ...prevValues,
+            [currentKey]: `${filters.order_date_from || ""} - ${
+              filters?.order_date_to || ""
+            }`,
+          };
+        }
         if (filters[currentKey]) {
           return { ...prevValues, [currentKey]: filters[currentKey] };
         }
@@ -31,6 +44,10 @@ export const SearchingForSection = () => {
   };
 
   const onResetSelectedFilter = (key: string) => {
+    if (key === "order_date_from") {
+      setFilters({ ...filters, order_date_from: "", order_date_to: "" });
+      return;
+    }
     setFilters({ ...filters, [key]: "" });
   };
 

package/src/sales/filters/SaleFilter.stories.tsx

@@ -13,7 +13,7 @@ export const Default: Story<SaleFiltersProps> = () => {
     name: "",
     email: "",
     date: "",
-    is_pending: false,
+    is_in_cart: false,
   });
 
   return <SaleFilters values={values} onChange={setValues} />;

package/src/sales/filters/SaleFilters.tsx

@@ -12,7 +12,7 @@ export interface Filters {
   order_date_to: string;
   orderable_date_from: string;
   orderable_date_to: string;
-  is_pending: boolean;
+  is_in_cart: boolean;
 }
 
 export interface SaleFiltersProps {

package/src/table/FilterHelperComponent.tsx

@@ -33,6 +33,7 @@ function FilterHelperComponent({
     if (onClickFn) {
       onClickFn("");
     }
+    setItem("");
   };
 
   const onSearch = () => {