diff options
| -rw-r--r-- | Form/Cart.hs | 32 | ||||
| -rw-r--r-- | Handler/Cart.hs | 4 | ||||
| -rw-r--r-- | Handler/CartItem.hs | 25 | ||||
| -rw-r--r-- | Handler/CartItemEdit.hs | 6 | ||||
| -rw-r--r-- | Handler/Shop.hs | 4 |
5 files changed, 36 insertions, 35 deletions
diff --git a/Form/Cart.hs b/Form/Cart.hs index ffc18c2..e59e3dc 100644 --- a/Form/Cart.hs +++ b/Form/Cart.hs @@ -77,14 +77,14 @@ $newline never |] return (res, widget) -cartItemEditForm :: CartId - -> Entity Item - -> Quantity - -> UserId - -> CartItem - -> Html - -> MForm Handler (FormResult CartItem, Widget) -cartItemEditForm cartid eitem qtymax userid scitem = +cartItemForm :: CartId + -> Entity Item + -> Quantity + -> UserId + -> CartItem + -> Html + -> MForm Handler (FormResult CartItem, Widget) +cartItemForm cartid eitem qtymax userid scitem = renderCartBootstrap eitem qtymax scitem $ CartItem <$> pure cartid <*> pure itemid @@ -156,14 +156,14 @@ $newline never |] return (res, widget) -cartItemForm :: CartId - -> Entity Item - -> Quantity - -> UserId - -> Maybe CartItem - -> Html - -> MForm Handler (FormResult CartItem, Widget) -cartItemForm cartid eitem quantitymax userid mscitem = +cartItemShopForm :: CartId + -> Entity Item + -> Quantity + -> UserId + -> Maybe CartItem + -> Html + -> MForm Handler (FormResult CartItem, Widget) +cartItemShopForm cartid eitem quantitymax userid mscitem = renderOrderBootstrap item quantitymax $ CartItem <$> pure cartid <*> pure itemid diff --git a/Handler/Cart.hs b/Handler/Cart.hs index 59aa6c7..940e381 100644 --- a/Handler/Cart.hs +++ b/Handler/Cart.hs @@ -2,7 +2,7 @@ module Handler.Cart where import Import -import Form.Cart (cartItemEditForm, ItemFormCart) +import Form.Cart (cartItemForm, ItemFormCart) import qualified Database.Esqueleto as E itemFormCart :: UserId @@ -11,7 +11,7 @@ itemFormCart :: UserId -> CartItem -> Handler ItemFormCart itemFormCart userid cartid eitem scitem = do - (orderWidget, enctype) <- generateFormPost $ cartItemEditForm + (orderWidget, enctype) <- generateFormPost $ cartItemForm cartid eitem newQty diff --git a/Handler/CartItem.hs b/Handler/CartItem.hs index 8fcd370..93e7d94 100644 --- a/Handler/CartItem.hs +++ b/Handler/CartItem.hs @@ -1,18 +1,18 @@ module Handler.CartItem where import Import -import Form.Cart (cartItemForm) +import Form.Cart (cartItemShopForm) getCartItemHelper :: ItemId -> UserId -> Handler Html getCartItemHelper itemid userid = do item <- runDB $ get404 itemid cartid <- getCartId userid - let itemForm = cartItemForm cartid - (Entity itemid item) - (itemStock item) - userid - Nothing - (orderWidget, enctype) <- generateFormPost itemForm + (orderWidget, enctype) <- generateFormPost $ cartItemShopForm + cartid + (Entity itemid item) + (itemStock item) + userid + Nothing defaultLayout $ do setTitleI MsgCartItemTitle $(widgetFile "cartitem-quantity") @@ -32,11 +32,12 @@ postCartItemHelper :: ItemId -> UserId -> Handler Html postCartItemHelper itemid userid = do item <- runDB $ get404 itemid cartid <- getCartId userid - ((res, _), _) <- runFormPost $ cartItemForm cartid - (Entity itemid item) - (itemStock item) - userid - Nothing + ((res, _), _) <- runFormPost $ cartItemShopForm + cartid + (Entity itemid item) + (itemStock item) + userid + Nothing case res of FormSuccess (CartItem cartid' _ quantity userid' date) -> do mduplicate <- runDB $ getBy $ UniqueCartCartItem cartid' itemid diff --git a/Handler/CartItemEdit.hs b/Handler/CartItemEdit.hs index b4d5b2a..a3112f8 100644 --- a/Handler/CartItemEdit.hs +++ b/Handler/CartItemEdit.hs @@ -1,7 +1,7 @@ module Handler.CartItemEdit where import Import -import Form.Cart (cartItemEditForm) +import Form.Cart (cartItemForm) cartItemEditNew :: ItemId -> Item -> Handler Html cartItemEditNew itemid item = do @@ -18,7 +18,7 @@ getCartItemHelper itemid userid = do where orderItem cartid item scitem = defaultLayout $ do (orderWidget, enctype) <- - handlerToWidget $ generateFormPost $ cartItemEditForm + handlerToWidget $ generateFormPost $ cartItemForm cartid (Entity itemid item) (itemStock item + cartItemQuantity scitem) @@ -42,7 +42,7 @@ postCartItemHelper itemid userid = do (orderItem cartid item) where orderItem cartid item escitem = do - ((res, _), _) <- runFormPost $ cartItemEditForm + ((res, _), _) <- runFormPost $ cartItemForm cartid (Entity itemid item) (itemStock item + cartItemQuantity scitem) diff --git a/Handler/Shop.hs b/Handler/Shop.hs index d8a0b70..39fed74 100644 --- a/Handler/Shop.hs +++ b/Handler/Shop.hs @@ -1,7 +1,7 @@ module Handler.Shop where import Import -import Form.Cart (cartItemForm, ItemFormCart) +import Form.Cart (cartItemShopForm, ItemFormCart) itemFormCart :: UserId -> CartId @@ -9,7 +9,7 @@ itemFormCart :: UserId -> Maybe CartItem -> Handler ItemFormCart itemFormCart userid cartid eitem mscitem = do - (orderWidget, enctype) <- generateFormPost $ cartItemForm + (orderWidget, enctype) <- generateFormPost $ cartItemShopForm cartid eitem (itemStock item) |