Skip to content

Commit d2c60c3

Browse files
Merge pull request #13 from ArthurPedroti/feat/rate-differential-calculator
Feat/differential rate calculator
2 parents 9afb1eb + a1074f5 commit d2c60c3

File tree

12 files changed

+4273
-50
lines changed

12 files changed

+4273
-50
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
REACT_APP_SERVER=https://192.168.2.250/
1+
REACT_APP_SERVER=https://192.168.2.251/

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pv-agf-frontend",
3-
"version": "0.9.6495",
3+
"version": "0.9.65",
44
"private": true,
55
"dependencies": {
66
"@date-io/date-fns": "^2.4.0",

prettier.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ module.exports = {
22
singleQuote: true,
33
trailingComma: 'all',
44
arrowParens: 'avoid',
5+
endOfLine: 'auto',
56
};

src/components/Menu.js

Lines changed: 7 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import CardTravelIcon from '@material-ui/icons/CardTravel';
2828
import ShoppingCartIcon from '@material-ui/icons/ShoppingCart';
2929
import DescriptionIcon from '@material-ui/icons/Description';
3030
import ListIcon from '@material-ui/icons/List';
31+
import EmojiSymbolsIcon from '@material-ui/icons/EmojiSymbols';
3132
import PrintIcon from '@material-ui/icons/Print';
3233
import CallSplitIcon from '@material-ui/icons/CallSplit';
3334
import Modal from '@material-ui/core/Modal';
@@ -41,20 +42,7 @@ import * as serviceWorker from '../serviceWorker';
4142
import { Creators as SelectCreators } from '../store/ducks/select_infos';
4243
import { Creators as PaymentCreators } from '../store/ducks/paymentList';
4344
import { Creators as ProductCreators } from '../store/ducks/productList';
44-
import {
45-
// loadSellers,
46-
// loadOperation_natures,
47-
loadSystem_clients,
48-
// loadSeller_clients,
49-
loadProducts,
50-
// loadKits,
51-
// loadMachines,
52-
// loadImportant_infos,
53-
// loadConditions,
54-
// loadTool_types,
55-
// loadPayment_methods,
56-
// loadFreights
57-
} from '../store/actions api/fetchBD';
45+
import { loadSystem_clients, loadProducts } from '../store/actions api/fetchBD';
5846
import pjson from '../../package.json';
5947
import { store } from '../store';
6048

@@ -178,32 +166,12 @@ function Menu({ title, values, dispatch, history }) {
178166

179167
async function SyncData() {
180168
handleOpen();
181-
// await store.dispatch(loadSellers());
182-
// await store.dispatch(loadOperation_natures());
183169
await store.dispatch(loadSystem_clients());
184-
// await store.dispatch(loadSeller_clients());
185170
await store.dispatch(loadProducts());
186-
// await store.dispatch(loadKits());
187-
// await store.dispatch(loadMachines());
188-
// await store.dispatch(loadImportant_infos());
189-
// await store.dispatch(loadConditions());
190-
// await store.dispatch(loadTool_types());
191-
// await store.dispatch(loadPayment_methods());
192-
// await store.dispatch(loadFreights());
193171
values.sync_date = new Date();
194172
handleClose();
195173
}
196174

197-
// const isServiceWorkerInitialized = useSelector(
198-
// state => state.serviceWorkerInitialized,
199-
// );
200-
// const isServiceWorkerUpdated = useSelector(
201-
// state => state.serviceWorkerUpdated,
202-
// );
203-
// const serviceWorkerRegistration = useSelector(
204-
// swState => swState.serviceWorkerRegistration,
205-
// );
206-
207175
async function UpdateServiceWorker() {
208176
handleOpen();
209177
await serviceWorker.unregister();
@@ -267,6 +235,11 @@ function Menu({ title, values, dispatch, history }) {
267235
/>
268236
<AppItem label="Gerar PDF" icon={<PrintIcon />} address="success" />
269237
<AppItem label="Pedidos" icon={<ListIcon />} address="orderslist" />
238+
<AppItem
239+
label="Calculadora de Diferencial de Alíquota"
240+
icon={<EmojiSymbolsIcon />}
241+
address="differential-rate-calculator"
242+
/>
270243
</List>
271244
<Divider />
272245
<List>

0 commit comments

Comments
 (0)