contentoh-components-library 21.2.96 → 21.2.98

package/dist/components/atoms/CheckBox/index.js

@@ -14,14 +14,17 @@ var CheckBox = function CheckBox(_ref) {
       label = _ref.label,
       onChange = _ref.onChange,
       isFilter = _ref.isFilter,
-      defaultChecked = _ref.defaultChecked;
+      defaultChecked = _ref.defaultChecked,
+      _ref$disabled = _ref.disabled,
+      disabled = _ref$disabled === void 0 ? false : _ref$disabled;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_styles.Container, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("input", {
       type: "checkbox",
       name: id,
       id: id,
       onChange: onChange,
-      defaultChecked: defaultChecked
+      defaultChecked: defaultChecked,
+      disabled: disabled
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("label", {
       htmlFor: id,
       children: label && /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {

package/dist/components/organisms/OrderDetail/OrderDetail.stories.js

@@ -179,7 +179,7 @@ OrderDetailDefault.args = {
     status: "PA",
     total: 731.2639770507812,
     timestamp: "2022-11-12T22:48:23.000Z",
-    payment: "pagado",
+    payment: null,
     deliver_date: "2022-11-19T00:00:00.000Z",
     product_count: 1,
     is_billing: 0
@@ -199,5 +199,6 @@ OrderDetailDefault.args = {
     }
 
     return console.log(args);
-  }
+  } // isProvider: true,
+
 };

package/dist/components/organisms/OrderDetail/index.js

@@ -80,6 +80,7 @@ var OrderDetail = function OrderDetail(props) {
   };
 
   (0, _react.useEffect)(function () {
+    var ac = new AbortController();
     props.getOrderDetail && props.getOrderDetail({
       query: {
         orderId: order.id_order
@@ -101,7 +102,11 @@ var OrderDetail = function OrderDetail(props) {
       setDataGeneral((0, _objectSpread2.default)((0, _objectSpread2.default)({}, countArticles), {}, {
         totalArticles: totalArticles
       }));
-    }); // eslint-disable-next-line react-hooks/exhaustive-deps
+    });
+    return function () {
+      return ac.abort();
+    }; // Abort both fetches on unmount
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [order.id_order]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_styles.MainContainer, {
     id: props.id,
@@ -112,7 +117,7 @@ var OrderDetail = function OrderDetail(props) {
           children: ["Orden de trabajo ", order.id_order]
         }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
           className: "buttons",
-          children: [showPaymentButton && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+          children: [showPaymentButton && !props.isProvider && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
             type: "primary",
             onClick: function onClick() {
               props.updatePaymentStatus(order.id_order, "pagado");
@@ -208,7 +213,8 @@ var OrderDetail = function OrderDetail(props) {
           name: "Fact.",
           type: "checkout"
         }],
-        data: orderData
+        data: orderData,
+        isProvider: props.isProvider
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "footer",

package/dist/components/organisms/OrderDetail/styles.js

@@ -15,7 +15,7 @@ var _variables = require("../../../global-files/variables");
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 
-var MainContainer = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  position: fixed;\n  right: 0;\n  width: 785px;\n  height: 100vh;\n  z-index: 5;\n  background: #ffffff;\n  box-sizing: border-box;\n  font-family: ", ";\n  & > * {\n    padding: 0 30px;\n  }\n  .headerTitle {\n    font-weight: bold;\n    font-size: 25px;\n  }\n\n  display: grid;\n  grid-template-columns: 1fr;\n  grid-template-rows: 101px 120px 1fr 115px;\n  grid-column-gap: 0px;\n  grid-row-gap: 0px;\n\n  .body {\n    overflow-y: auto;\n  }\n  .footer {\n    width: 100%;\n    display: flex;\n    align-items: center;\n    height: 115px;\n    border-top: 1px solid #e6e6e6;\n    position: sticky;\n    bottom: 0;\n    padding: 20px;\n    box-sizing: border-box;\n    > h2 {\n      margin-right: 20px;\n    }\n    > div {\n      margin-right: 10px;\n    }\n  }\n"])), _variables.FontFamily.Roboto);
+var MainContainer = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  position: fixed;\n  top: 0;\n  right: 0;\n  width: 785px;\n  height: 100vh;\n  z-index: 5;\n  background: #ffffff;\n  box-sizing: border-box;\n  font-family: ", ";\n  & > * {\n    padding: 0 30px;\n  }\n  .headerTitle {\n    font-weight: bold;\n    font-size: 25px;\n  }\n\n  display: grid;\n  grid-template-columns: 1fr;\n  grid-template-rows: 101px 120px 1fr 115px;\n  grid-column-gap: 0px;\n  grid-row-gap: 0px;\n\n  .body {\n    overflow-y: auto;\n  }\n  .footer {\n    width: 100%;\n    display: flex;\n    align-items: center;\n    height: 115px;\n    border-top: 1px solid #e6e6e6;\n    position: sticky;\n    bottom: 0;\n    padding: 20px;\n    box-sizing: border-box;\n    > h2 {\n      margin-right: 20px;\n    }\n    > div {\n      margin-right: 10px;\n    }\n  }\n"])), _variables.FontFamily.Roboto);
 
 exports.MainContainer = MainContainer;
 

package/dist/components/organisms/OrderDetail/utils/Table/index.js

@@ -151,7 +151,8 @@ function Table(props) {
               e.stopPropagation();
               value && value.onChange(id, e.target.checked);
             },
-            defaultChecked: value.value
+            defaultChecked: value.value,
+            disabled: props.isProvider
           })
         });
 

package/dist/global-files/fonts.css

@@ -64,7 +64,7 @@
 
 @font-face {
   font-family: "Roboto";
-  src: url("../assets/fonts/Roboto/Roboto-Regular.ttf");
+  src: url("../assets/fonts/roboto/Roboto-Regular.ttf");
   font-weight: 400;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentoh-components-library",
-  "version": "21.2.96",
+  "version": "21.2.98",
   "dependencies": {
     "@aws-amplify/auth": "^4.5.3",
     "@aws-amplify/datastore": "^3.11.0",

package/src/components/atoms/CheckBox/index.js

@@ -1,6 +1,13 @@
 import { Container } from "./styles";
 
-export const CheckBox = ({ id, label, onChange, isFilter, defaultChecked }) => {
+export const CheckBox = ({
+  id,
+  label,
+  onChange,
+  isFilter,
+  defaultChecked,
+  disabled = false,
+}) => {
   return (
     <Container key={`check-${id}`}>
       <input
@@ -9,6 +16,7 @@ export const CheckBox = ({ id, label, onChange, isFilter, defaultChecked }) => {
         id={id}
         onChange={onChange}
         defaultChecked={defaultChecked}
+        disabled={disabled}
       />
       <label htmlFor={id}>
         {label && <p className={isFilter && "filter-text"}>{label}</p>}

package/src/components/organisms/OrderDetail/OrderDetail.stories.js

@@ -62,7 +62,7 @@ OrderDetailDefault.args = {
     status: "PA",
     total: 731.2639770507812,
     timestamp: "2022-11-12T22:48:23.000Z",
-    payment: "pagado",
+    payment: null,
     deliver_date: "2022-11-19T00:00:00.000Z",
     product_count: 1,
     is_billing: 0,
@@ -71,4 +71,5 @@ OrderDetailDefault.args = {
   updateBilling,
   updateGeneralBilling: (...args) => console.log(args),
   setShowOrderDetail: (...args) => console.log(args),
+  // isProvider: true,
 };

package/src/components/organisms/OrderDetail/index.js

@@ -50,6 +50,7 @@ export const OrderDetail = (props) => {
   };
 
   useEffect(() => {
+    const ac = new AbortController();
     props.getOrderDetail &&
       props
         .getOrderDetail({ query: { orderId: order.id_order } })
@@ -75,6 +76,7 @@ export const OrderDetail = (props) => {
           setOrderData(obj);
           setDataGeneral({ ...countArticles, totalArticles });
         });
+    return () => ac.abort(); // Abort both fetches on unmount
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [order.id_order]);
 
@@ -84,7 +86,7 @@ export const OrderDetail = (props) => {
         <SpaceBetween>
           <h2 className="headerTitle">Orden de trabajo {order.id_order}</h2>
           <div className="buttons">
-            {showPaymentButton && (
+            {showPaymentButton && !props.isProvider && (
               <Button
                 type="primary"
                 onClick={() => {
@@ -163,6 +165,7 @@ export const OrderDetail = (props) => {
             { width: 65, name: "Fact.", type: "checkout" },
           ]}
           data={orderData}
+          isProvider={props.isProvider}
         />
       </div>
       <div className="footer">

package/src/components/organisms/OrderDetail/styles.js

@@ -3,6 +3,7 @@ import { FontFamily } from "../../../global-files/variables";
 
 export const MainContainer = styled.div`
   position: fixed;
+  top: 0;
   right: 0;
   width: 785px;
   height: 100vh;

package/src/components/organisms/OrderDetail/utils/Table/index.js

@@ -74,6 +74,7 @@ export default function Table(props) {
                   value && value.onChange(id, e.target.checked);
                 }}
                 defaultChecked={value.value}
+                disabled={props.isProvider}
               />
             </div>
           )

package/src/global-files/fonts.css

@@ -64,7 +64,7 @@
 
 @font-face {
   font-family: "Roboto";
-  src: url("../assets/fonts/Roboto/Roboto-Regular.ttf");
+  src: url("../assets/fonts/roboto/Roboto-Regular.ttf");
   font-weight: 400;
 }