Index: src/stock-adjustment-mobile/adjustment-app.jsx
===================================================================
diff -u -N -rc1d2668dd21bf733d1acf2f95a690a61473e36f0 -rc337cc219b24bface3d7690246b3d774541a8d85
--- src/stock-adjustment-mobile/adjustment-app.jsx (.../adjustment-app.jsx) (revision c1d2668dd21bf733d1acf2f95a690a61473e36f0)
+++ src/stock-adjustment-mobile/adjustment-app.jsx (.../adjustment-app.jsx) (revision c337cc219b24bface3d7690246b3d774541a8d85)
@@ -22,27 +22,23 @@
import AdjustmentForm from './adjustment-form.component';
import ProgramSelect from './program-select';
-const AdjustmentApp = props => {
- const {
+const AdjustmentApp = ({
adjustmentType,
facilityFactory,
stockAdjustmentCreationService,
orderableGroupService,
existingStockOrderableGroupsFactory,
stockReasonsFactory,
offlineService,
- } = props;
+ }) => {
const dispatch = useDispatch();
const userHomeFacility = useSelector(state => state.facilities.userHomeFacility);
useEffect(
() => {
facilityFactory.getUserHomeFacility()
- .then(facility => {
- dispatch(setUserHomeFacility(facility));
- },
- )
+ .then(facility => dispatch(setUserHomeFacility(facility)))
},
[facilityFactory]
);
Index: src/stock-adjustment-mobile/adjustment-form.component.jsx
===================================================================
diff -u -N -rc1d2668dd21bf733d1acf2f95a690a61473e36f0 -rc337cc219b24bface3d7690246b3d774541a8d85
--- src/stock-adjustment-mobile/adjustment-form.component.jsx (.../adjustment-form.component.jsx) (revision c1d2668dd21bf733d1acf2f95a690a61473e36f0)
+++ src/stock-adjustment-mobile/adjustment-form.component.jsx (.../adjustment-form.component.jsx) (revision c337cc219b24bface3d7690246b3d774541a8d85)
@@ -41,7 +41,7 @@
title: `Are you sure you want to submit ${adjustment.length} product${adjustment.length === 1 ? '' : 's'} for Adjustments?`,
confirmLabel: 'Confirm',
confirmButtonClass: 'primary',
- onConfirm: () => submitAdjustment()
+ onConfirm: submitAdjustment
});
};
@@ -65,7 +65,7 @@
}
const onDelete = () => {
- // TODO - delete products from adjustment
+ dispatch(resetAdjustment(adjustment));
showToast('success');
history.push("/makeAdjustmentAddProducts/submitAdjustment/programChoice");
};
@@ -107,7 +107,7 @@
title: "Are you sure you want to delete this Adjustment?",
confirmLabel: 'Delete',
confirmButtonClass: 'danger',
- onConfirm: () => onDelete()
+ onConfirm: onDelete
})}
className="danger"
style={{marginLeft: "5%"}}
Index: src/stock-adjustment-mobile/components/read-only-table.component.jsx
===================================================================
diff -u -N -r112d9b69164f6cbb93c29dbe9b3bfff80fb35a9d -rc337cc219b24bface3d7690246b3d774541a8d85
--- src/stock-adjustment-mobile/components/read-only-table.component.jsx (.../read-only-table.component.jsx) (revision 112d9b69164f6cbb93c29dbe9b3bfff80fb35a9d)
+++ src/stock-adjustment-mobile/components/read-only-table.component.jsx (.../read-only-table.component.jsx) (revision c337cc219b24bface3d7690246b3d774541a8d85)
@@ -43,16 +43,14 @@
{headerGroups.map(headerGroup => (
- {headerGroup.headers.map(column => {
- return column.hideHeader === true ? null : (
-
- ))}
-
+ ))}
+
{column.render("Header")}
- );
- })}
+ {headerGroup.headers.map(column => !column.hideHeader && (
+ {column.render("Header")}
+ ))}
- {toast.description} -
-+ {toast.description} +