Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 40a6e261 by Tuomas Riihimäki
Options

Add possibility for admin to enter product count as number in shop

1 parent 48abfe98
Inline Side-by-side
Showing with 22 additions and 24 deletions
code/MoyaWeb/WebContent/resources/cditools/shop/shoppingcart.xhtml
...@@ -40,35 +40,27 @@ ...@@ -40,35 +40,27 @@
<br /> <br />
<p:dataTable id="prods" value="#{productShopView.boughtItems}" var="prods"> <p:dataTable id="prods" value="#{productShopView.boughtItems}" var="prods">
<p:column> <p:column headerText="#{i18n['shop.count']}">
<f:facet name="header"> <p:inputText value="#{prods.count}" size="2">
<h:outputText value="#{i18n['shop.count']}" /> <f:ajax render="@form" listener="#{productShopView.countBoughtChangeListener}" />
</f:facet> <f:convertNumber minFractionDigits="0" maxFractionDigits="2" />
<p:inplace> </p:inputText>
<h:outputText value="#{prods.count}" size="4">
<f:convertNumber minFractionDigits="0" maxFractionDigits="2" />
</h:outputText>
</p:inplace>
</p:column> </p:column>
<p:column> <p:column headerText="#{i18n['shop.product']}">
<f:facet name="header">
<h:outputText value="#{i18n['shop.product']}" />
</f:facet>
<h:outputText value="#{prods.getProduct().name}" /> <h:outputText value="#{prods.getProduct().name}" />
</p:column> </p:column>
<p:column> <p:column headerText="#{i18n['shop.price']}">
<f:facet name="header">
<h:outputText value="#{i18n['shop.price']}" />
</f:facet>
<h:outputText value="#{prods.getProduct().price}"> <h:outputText value="#{prods.getProduct().price}">
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" /> <f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column> <p:column headerText="#{i18n['shop.totalPrice']}">
<f:facet name="header"> <h:outputText value="#{prods.price}">
<h:outputText value="#{i18n['shop.actions']}" /> <f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
</f:facet> </h:outputText>
</p:column>
<p:column headerText="#{i18n['shop.actions']}">
<p:commandButton action="#{productShopView.removeBought()}" update="@form" onerror="location.reload(true);" value="Poista" /> <p:commandButton action="#{productShopView.removeBought()}" update="@form" onerror="location.reload(true);" value="Poista" />
</p:column> </p:column>
</p:dataTable> </p:dataTable>
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
...@@ -860,6 +860,7 @@ shop.product = Product ...@@ -860,6 +860,7 @@ shop.product = Product
shop.readBarcode = Read shop.readBarcode = Read
shop.shop = Shop shop.shop = Shop
shop.shoppingcartCommitted = Products bought shop.shoppingcartCommitted = Products bought
shop.toAccountValue = To account
shop.totalPrice = Total shop.totalPrice = Total
shop.transactionTotal = Transaction total shop.transactionTotal = Transaction total
shop.user = Selling to shop.user = Selling to
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/shop/ProductShopView.java
...@@ -9,7 +9,6 @@ import java.util.Map; ...@@ -9,7 +9,6 @@ import java.util.Map;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.ConversationScoped;
import javax.faces.event.AjaxBehaviorEvent;
import javax.faces.model.ListDataModel; import javax.faces.model.ListDataModel;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
...@@ -163,10 +162,16 @@ public class ProductShopView extends GenericCDIView { ...@@ -163,10 +162,16 @@ public class ProductShopView extends GenericCDIView {
} }
} }
public void countChangeListener(AjaxBehaviorEvent e) public void countBoughtChangeListener()
{
ProductShopItem item = boughtItems.getRowData();
psiHelper.setProductShopItemCount(item, item.getCount());
updateCartLimits(item);
}
public void countChangeListener()
{ {
ProductShopItem item = shoppingcart.getRowData(); ProductShopItem item = shoppingcart.getRowData();
logger.info("Count change from event {}, src {}, from item {}", e, e.getSource(), item.getCount());
psiHelper.setProductShopItemCount(item, item.getCount()); psiHelper.setProductShopItemCount(item, item.getCount());
updateCartLimits(item); updateCartLimits(item);
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!