Handling purchases and updating the UI. Fix bug with price in BurgerB…

…uilder.

src/containers/BurgerBuilder/BurgerBuilder.js

@@ -9,7 +9,7 @@ import Modal from '../../components/UI/Modal/Modal';
 import OrderSummary from '../../components/Burger/OrderSummary/OrderSummary';
 import Spinner from '../../components/UI/Spinner/Spinner';
 import withErrorHandler from '../../hoc/withErrorHandler/withErrorHandler';
-import * as burgerBuilderActions from '../../store/actions/index';
+import * as actions from '../../store/actions/index';
 
 class BurgerBuilder extends Component {
     state = {
@@ -42,6 +42,7 @@ class BurgerBuilder extends Component {
     }
 
     purchaseContinuedHandler = () => {
+        this.props.onInitPurchase();
         this.props.history.push('/checkout');
     }
 
@@ -97,9 +98,10 @@ const mapStateToProps = state => {
 
 const mapDispatchToProps = dispatch => {
     return {
-        onIngredientAdded: (ingName) => dispatch(burgerBuilderActions.addIngredient(ingName)),
-        onIngredientRemoved: (ingName) => dispatch(burgerBuilderActions.removeIngredient(ingName)),
-        onInitIngredients: () => dispatch(burgerBuilderActions.initIngredients())
+        onIngredientAdded: (ingName) => dispatch(actions.addIngredient(ingName)),
+        onIngredientRemoved: (ingName) => dispatch(actions.removeIngredient(ingName)),
+        onInitIngredients: () => dispatch(actions.initIngredients()),
+        onInitPurchase: () =>  dispatch(actions.purchaseBurgerInit())
     };
 };
 

src/containers/Checkout/Checkout.js

@@ -6,6 +6,7 @@ import CheckoutSmmary from '../../components/Order/CheckoutSummary/CheckoutSumma
 import ContactData from './ContactData/ContactData';
 
 class Checkout extends Component {
+
     checkoutCancelledHandler = () => {
         this.props.history.goBack();
     }
@@ -16,8 +17,8 @@ class Checkout extends Component {
 
     render() {
         let summary = <Redirect to="/" />
-
-        if (this.props.ings) {
+        
+        if (this.props.ings && !this.props.purchased) {
             summary = (
                 <div>
                     <CheckoutSmmary 
@@ -39,7 +40,8 @@ class Checkout extends Component {
 
 const mapStateToProps =  state => {
     return {
-        ings: state.burgerBuilder.ingredients
+        ings: state.burgerBuilder.ingredients,
+        purchased: state.order.purchased
     };
 };
 

src/store/actions/actionTypes.js

@@ -6,3 +6,4 @@ export const FETCH_INGREDIENTS_FAILED = 'FETCH_INGREDIENTS_FAILED';
 export const PURCHASE_BURGER_START = 'PURCHASE_BURGER_START';
 export const PURCHASE_BURGER_SUCCESS = 'PURCHASE_BURGER_SUCCESS';
 export const PURCHASE_BURGER_FAIL = 'PURCHASE_BURGER_FAIL';
+export const PURCHASE_BURGER_INIT = 'PURCHASE_INIT';

src/store/actions/index.js

@@ -5,5 +5,6 @@ export {
 } from './burgerBuilder';
 
 export {
-    purchaseBurger
+    purchaseBurger,
+    purchaseBurgerInit
 } from './order';

src/store/actions/order.js

@@ -34,3 +34,9 @@ export const purchaseBurger = (orderData) => {
             });
     };
 };
+
+export const purchaseBurgerInit = () => {
+    return {
+        type: actionTypes.PURCHASE_BURGER_INIT
+    };
+};

src/store/reducers/burgerBuilder.js

@@ -7,9 +7,11 @@ const INGREDIENT_PRICES = {
     meat: 1.3
 }
 
+const BASE_PRICE = 4;
+
 const initialState = {
     ingredients: null,
-    totalPrice: 5,
+    totalPrice: BASE_PRICE,
     error: false
 };
 
@@ -53,7 +55,7 @@ const removeIngredient = (state, action, updatedState) => {
 }
 
 const setIngredient = (state, action, updatedState) => {
-    let price = state.totalPrice;
+    let price = BASE_PRICE;
     for (let ingredient in action.ingredients) {
         price += INGREDIENT_PRICES[ingredient] * action.ingredients[ingredient];
     }

src/store/reducers/order.js

@@ -2,13 +2,17 @@ import * as actionTypes from '../actions/actionTypes';
 
 const initialState = {
     orders: [],
-    loading: false
+    loading: false,
+    purchased: false
 }
 
 const reducer = (state = initialState, action) => {
     let updatedState = JSON.parse(JSON.stringify(state));
 
     switch ( action.type ) {
+        case actionTypes.PURCHASE_BURGER_INIT:
+            updatedState = purchaseBurgerInit(state, action, updatedState);
+            break;
         case actionTypes.PURCHASE_BURGER_START:
             updatedState = purchaseBurgerStart(state, action, updatedState);
             break;
@@ -28,6 +32,12 @@ const reducer = (state = initialState, action) => {
 
 export default reducer;
 
+// Auxiliary Functions
+const purchaseBurgerInit = (state, action, updatedState) => {
+    updatedState.purchased = false;
+    return updatedState;
+}
+
 const purchaseBurgerStart = (state, action, updatedState) => {
     updatedState.loading = true;
     return updatedState;
@@ -39,6 +49,7 @@ const purchaseBurgerSuccess = (state, action, updatedState) => {
         ...action.orderData
     };
     updatedState.loading = false;
+    updatedState.purchased = true;
     updatedState.orders = state.orders.concat(newOrder);
     return updatedState;
 }