Merge pull request #11 from ArthurPedroti/feat/quick-coupler-order-type

Feat/quick coupler order type

Author: ArthurPedroti

README.md

@@ -65,15 +65,15 @@
 ## Roadmap
 
 ### Bugs
-- [x] Payment calculation with non-integer values
-- [x] Only down payment on payment option
-- [ ] Pushing groups from CDE
+- [x] Loading text from "Imprimindo..." to "Gerando PDF"
+- [x] Don't show coupler if coupler isn't selected
+- [x] Put order date on the first item to appear(on confirmation)
+- [x] Pushing groups from CDE
 
 ### Features
-- [x] Place on top input order date
-- [x] Column "item" at products
-- [x] Show the payment calculation errors at payment page
-- [ ] Create an input of delivery date
+- [x] Page for quick coupler orders
+- [x] Today order default value
+- [x] Create an input of delivery date
 - [ ] File explorer to save the pdf on mobile
 - [ ] Select the group before the products
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pv-agf-frontend",
-  "version": "0.9.63",
+  "version": "0.9.64",
   "private": true,
   "dependencies": {
     "@date-io/date-fns": "^2.4.0",

public/manifest.json

@@ -8,12 +8,12 @@
       "type": "image/x-icon"
     },
     {
-      "src": "logo192.png",
+      "src": "android-chrome-192x192.png",
       "type": "image/png",
       "sizes": "192x192"
     },
     {
-      "src": "logo512.png",
+      "src": "android-chrome-512x512.png",
       "type": "image/png",
       "sizes": "512x512"
     }

src/components/Menu.js

@@ -56,7 +56,7 @@ import {
 import pjson from '../../package.json';
 import { store } from '../store';
 
-const useStyles = makeStyles((theme) => ({
+const useStyles = makeStyles(theme => ({
   list: {
     width: 250,
   },
@@ -91,33 +91,21 @@ const App = styled(AppBar)({
   margin: '0 0 20px 0',
 });
 
-const AppItem = ({
-  address, label, icon, subtitle,
-}) => (
+const AppItem = ({ address, label, icon, subtitle }) => (
   <ListItem button component={Link} to={address}>
     <ListItemIcon>{icon}</ListItemIcon>
-    <ListItemText
-      primary={label}
-      secondary={subtitle}
-    />
+    <ListItemText primary={label} secondary={subtitle} />
   </ListItem>
 );
 
-const AppItemAction = ({
-  label, action, icon, subtitle,
-}) => (
+const AppItemAction = ({ label, action, icon, subtitle }) => (
   <ListItem button onClick={action}>
     <ListItemIcon>{icon}</ListItemIcon>
-    <ListItemText
-      primary={label}
-      secondary={subtitle}
-    />
+    <ListItemText primary={label} secondary={subtitle} />
   </ListItem>
 );
 
-function Menu({
-  title, values, dispatch, history,
-}) {
+function Menu({ title, values, dispatch, history }) {
   const classes = useStyles();
   const [state, setState] = React.useState({
     top: false,
@@ -126,10 +114,10 @@ function Menu({
     right: false,
   });
 
-  const toggleDrawer = (side, open) => (event) => {
+  const toggleDrawer = (side, open) => event => {
     if (
-      event.type === 'keydown'
-      && (event.key === 'Tab' || event.key === 'Shift')
+      event.type === 'keydown' &&
+      (event.key === 'Tab' || event.key === 'Shift')
     ) {
       return;
     }
@@ -156,6 +144,15 @@ function Menu({
     await dispatch(destroy('infoReduxForm'));
     await store.dispatch(change('infoReduxForm', 'login', true));
     await store.dispatch(change('infoReduxForm', 'sync_date', sync_date));
+    await store.dispatch(change('infoReduxForm', 'payment_type', false));
+    await store.dispatch(change('infoReduxForm', 'contrato', 'nao'));
+    await store.dispatch(
+      change(
+        'infoReduxForm',
+        'data_pc',
+        new Date().toISOString().substring(0, 10),
+      ),
+    );
     await store.dispatch(ProductCreators.resetProduct());
     await store.dispatch(PaymentCreators.resetPayment());
     await store.dispatch(SelectCreators.resetSelect());
@@ -189,7 +186,15 @@ function Menu({
     handleClose();
   }
 
-  const sideList = (side) => (
+  async function UpdateServiceWorker() {
+    handleOpen();
+    await navigator.serviceWorker.register('/sw.js').then(reg => {
+      reg.update();
+    });
+    handleClose();
+  }
+
+  const sideList = side => (
     <div
       className={classes.list}
       role="presentation"
@@ -248,7 +253,7 @@ function Menu({
       <Divider />
       <List>
         <AppItemAction
-          label="Sincronizar Dados "
+          label="Sincronizar Dados"
           subtitle={dataAtualFormatada(
             values === undefined ? null : values.sync_date,
           )}
@@ -262,9 +267,10 @@ function Menu({
         />
         <AppItemAction label="Sair" icon={<ExitToAppIcon />} action={logout} />
       </List>
-      <AppItem
+      <AppItemAction
         icon={<SettingsApplicationsIcon />}
         subtitle={`v${pjson.version}`}
+        action={UpdateServiceWorker}
         address={() => {}}
       />
     </div>
@@ -325,7 +331,7 @@ function Menu({
   );
 }
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = state => ({
   values: getFormValues('infoReduxForm')(state),
 });