Dev branch

app/controllers/BalanceAPI.java

@@ -15,6 +15,34 @@ public class BalanceAPI extends AuthController {
     static MailSender mailSender = new MailSenderImpl();
     static LiqPayService liqPay = LiqPayServiceImpl.getInstance();
 
+    public static void  getCurrencyList(String client) throws Exception {
+        ShopDTO shop = ShopDTO.find("byDomain", client).first();
+        if (shop == null) {
+            shop = ShopDTO.find("byDomain", "localhost").first();
+        }
+        checkAuthentification(shop);
+
+        if (shop.currencyShop != null) {
+            renderJSON(json(shop.currencyShop.currencyList));
+        }
+    }
+
+    public static void setCurrency(String client, String currency) throws Exception {
+
+        ShopDTO shop = ShopDTO.find("byDomain", client).first();
+        if (shop == null) {
+            shop = ShopDTO.find("byDomain", "localhost").first();
+        }
+        checkAuthentification(shop);
+
+        if (!currency.isEmpty()){
+            shop.currencyShop = Application.setCurrencyToShop(shop);
+            shop.currencyShop.currency = currency;
+            shop.currencyShop.save();
+        }
+
+        renderJSON(json(shop));
+    }
 
     public static void getBalance(String client, String email) throws Exception {
         ShopDTO shop = ShopDTO.find("byDomain", client).first();

app/controllers/OrderAPI.java

@@ -115,6 +115,9 @@ private static OrderItemListResult _parseOrderItemsList(List<LineItem> items, Or
             orderItem.additionsList = additionList;
             orderItem.save();
             orderItemList.add(orderItem);
+            if (product.priceInCurrency != 0) {
+                product.price = product.priceInCurrency;
+            }
             totalCost += product.price * orderItem.quantity;
         }
 
@@ -128,20 +131,22 @@ private static String getLanguagePartWithoutLocale(String language) {
     }
 
     public static String getTranslatedShopName(ShopDTO shop, String language) {
-        List<TranslationItemDTO> translationList = null;
-        if (shop.shopNameTextTranslationBucket != null) {
-            translationList = shop.shopNameTextTranslationBucket.translationList;
-        } else {
+        if (shop.shopNameTextTranslationBucket == null) {
             return shop.shopName;
-        }
-        TranslationItemDTO adminTranslationItemDTO = translationList.stream().filter(shopTranslate -> shopTranslate.language.equals(language)).collect(Collectors.toList()).get(0);
-        if (!translationList.isEmpty() && !adminTranslationItemDTO.content.isEmpty()) {
+        } else {
+            List<TranslationItemDTO> translationList = shop.shopNameTextTranslationBucket.translationList;
+            TranslationItemDTO adminTranslationItemDTO = translationList
+                    .stream()
+                    .filter(shopTranslate -> shopTranslate.language.equals(language))
+                    .collect(Collectors.toList()).get(0);
+
             return adminTranslationItemDTO.content;
         }
-        return shop.shopName;
+
     }
 
     public static void create(String client, String chosenLanguage) throws Exception {
+
         String jsonCart = "";
         if (request.params.get("cart") != null) {
             jsonCart = request.params.get("cart");
@@ -169,11 +174,11 @@ public static void create(String client, String chosenLanguage) throws Exception
             String languageFromAccept = languageList.get(0).getRange();
             String[] strings = languageFromAccept.split("-");
             clientLanguage = strings[0];
-
         }
 
-
         OrderDTO order = new OrderDTO(shoppingCart, shop, agent, ip);
+        String currency = shop.currencyShop.selectedCurrency != null ? shop.currencyShop.selectedCurrency : shop.currencyShop. currency;
+        order.currency = currency;
         order.clientLanguage = clientLanguage;
         order.chosenClientLanguage = chosenLanguage;
         order.save();
@@ -242,6 +247,7 @@ public static void create(String client, String chosenLanguage) throws Exception
             json.put("reason", "Total amount is less than minimum order amount");
             error(403, json.toString());
         }
+
         order.feedbackRequestState = FeedbackRequestState.REQUEST_NOT_SEND;
         order = order.save();
 
@@ -748,6 +754,7 @@ public static void success(String client, String data) throws Exception {
 
 
     }
+
     private static String generateHtmlEmailForOrderPaymentError(ShopDTO shop, OrderDTO order, String changeLanguage) {
         String templateString = MailSenderImpl.readAllBytesJava7("app/emails/email_notification_payment_error.html");
         Template template = Template.parse(templateString);
@@ -770,6 +777,7 @@ private static String generateHtmlEmailForOrderPaymentError(ShopDTO shop, OrderD
         String rendered = template.render(map);
         return rendered;
     }
+
     private static String generateHtmlEmailForOrderPaymentDone(ShopDTO shop, OrderDTO order, String changeLanguage) {
         String templateString = MailSenderImpl.readAllBytesJava7("app/emails/email_notification_payment_done.html");
         Template template = Template.parse(templateString);
@@ -792,6 +800,7 @@ private static String generateHtmlEmailForOrderPaymentDone(ShopDTO shop, OrderDT
         String rendered = template.render(map);
         return rendered;
     }
+
     private static String generateHtmlEmailForOrderPaymentWaitAccept(ShopDTO shop, OrderDTO order, String changeLanguage) {
         String templateString = MailSenderImpl.readAllBytesJava7("app/emails/email_notification_payment_wait_accept.html");
         Template template = Template.parse(templateString);
@@ -814,6 +823,7 @@ private static String generateHtmlEmailForOrderPaymentWaitAccept(ShopDTO shop, O
         String rendered = template.render(map);
         return rendered;
     }
+
     private static String generateHtmlEmailForFeedbackToOrder(ShopDTO shop, OrderDTO order, String changeLanguage) {
         String templateString = MailSenderImpl.readAllBytesJava7("app/emails/email_feedback_to_order.html");
         Template template = Template.parse(templateString);
@@ -841,14 +851,13 @@ private static String generateHtmlEmailForFeedbackToOrder(ShopDTO shop, OrderDTO
         return rendered;
 
     }
+
     private static String generateHtmlEmailForNewOrder(ShopDTO shop, OrderDTO order, String language) {
 
         Filter.registerFilter(new Filter("total"){
             @Override
             public Object apply(Object value, Object... params) {
-
                 DecimalFormat format = new DecimalFormat("0.##");
-
                 return format.format(value);
             }
         });
@@ -953,7 +962,7 @@ public Object apply(Object value, Object... params) {
         String creditCardDeliveryPaymentType = Messages.get("mail.label.creditCardDeliveryPaymentType");
         map.put("creditCardDeliveryPaymentType", creditCardDeliveryPaymentType);
 
-        String labelCurrencyUah = Messages.get("mail.label.currency.uah");
+        String labelCurrencyUah = Messages.get("mail.label.currencyShop.uah");
         map.put("labelCurrencyUah", labelCurrencyUah);
 
         String rendered = template.render(map);

app/controllers/ProductAPI.java

@@ -50,7 +50,7 @@ public static void create(String client, String name, String description,
         }
 
         CategoryDTO cat = CategoryDTO.findById(category);
-        ProductDTO product = new ProductDTO(name, description, price, images, shop, cat, wholesaleCount, wholesalePrice);
+        ProductDTO product = new ProductDTO(nameUk, descriptionUk, price, images, shop, cat, wholesaleCount, wholesalePrice);
         product.mainImage = images.get(mainPhotoIndex);
         product.isActive = isActive;
         product.sortOrder = sortOrder;

app/controllers/ShopAPI.java

@@ -79,6 +79,10 @@ public static void details(String client) throws Exception { // /shop/details
             shop = ShopDTO.find("byDomain", "localhost").first();
         }
         checkAuthentification(shop);
+        CurrencyShopDTO currencyShop = CurrencyShopDTO.find("byShop", shop).first();
+        if (currencyShop != null) {
+            shop.currencyShop = currencyShop;
+        }
         renderJSON(json(shop));
     }
 

app/controllers/UserDashBoardAPI.java

@@ -1,15 +1,12 @@
 package controllers;
 
+import jobs.GetDailyCurrency;
 import models.*;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import play.i18n.Lang;
 import play.mvc.Before;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
@@ -70,20 +67,27 @@ public static void createShop() throws Exception{
         BalanceDTO balance = new BalanceDTO();
         VisualSettingsDTO visualSettings = new VisualSettingsDTO();
 
+        CurrencyShopDTO currencyShop = new CurrencyShopDTO();
+        currencyShop.currency = user.wizard.shopCurrency;
+
         ShopDTO shop = new ShopDTO(users, paymentSettings, delivery,
                 contact, balance, visualSettings, user.wizard.shopName,
-                "public liqpay key here", "private liqpay key here", user.wizard.shopDomain, "uk_UA"
-        );
+                "public liqpay key here", "private liqpay key here", user.wizard.shopDomain,
+                "uk_UA");
         shop.googleStaticMapsApiKey = "AIzaSyCcBhIqH-XMcNu99hnEKvWIZTrazd9XgXg";
         shop.googleMapsApiKey = "AIzaSyAuKg9jszEEgoGfUlIqmd4n9czbQsgcYRM";
         visualSettings.shop = shop;
+        currencyShop.shop = shop;
+        shop.currencyShop = currencyShop;
+        currencyShop.save();
 
         _appendDomainToList(user.wizard.shopDomain);
         shop.save();
         renderJSON(json(shop));
 
     }
 
+
     private static void setTranslationForCashPaymentLabel(PaymentSettingsDTO payment) {
         if (payment.manualPaymentTitleTranslationBucket == null){
             System.out.println("delivery.selfTakeTranslationBucket is null and will be creating NEW");

app/controllers/WayForPayAPI.java

@@ -74,9 +74,6 @@ public WayForPayRequestParams(String merchantAccount, String merchantDomainName,
             this.serviceUrl = serviceUrl;
         }
 
-
-
-
     }
 
     static String merchantAccount = "wisehands_me";
@@ -176,6 +173,7 @@ public static void generateSignatureWayForPay(String client) throws Exception{
         ShopDTO shop = ShopDTO.findById(shopUuid);
 
         String productName = "Поповнення власного рахунку для магазину " + shop.shopName;
+        // TODO check url
         String serviceUrl = "https://wstore.pro/wayforpay/payment-confirmation";
         Double amount = Double.valueOf(request.params.get("amount"));
         String formatDecimal = formatDecimal(amount);

app/controllers/WizardAPI.java

@@ -146,6 +146,11 @@ public static void setVariantsOfDeliveryAndPaymentTypes() throws Exception{
         boolean courierDelivery = (boolean) jsonBody.get("courierDelivery");
         boolean postDepartment = (boolean) jsonBody.get("postDepartment");
         boolean selfTake = (boolean) jsonBody.get("selfTake");
+
+        boolean uah = (boolean) jsonBody.get("uahCurrency");
+        boolean usd = (boolean) jsonBody.get("usdCurrency");
+        boolean eur = (boolean) jsonBody.get("eurCurrency");
+
         boolean payCash = true;
         boolean payOnline = false;
 
@@ -159,12 +164,23 @@ public static void setVariantsOfDeliveryAndPaymentTypes() throws Exception{
         user.wizard.selfTake = selfTake;
         user.wizard.payCash = payCash;
         user.wizard.payOnline = payOnline;
+        user.wizard.shopCurrency = setCurrencyToShop(uah, usd, eur);
 
         user.wizard.save();
         renderJSON(json(user.wizard));
 
     }
 
+    private static String setCurrencyToShop(boolean uah, boolean usd, boolean eur) {
+        if (uah){
+            return "UAH";
+        } else if (usd) {
+            return "USD";
+        } else {
+            return "EUR";
+        }
+    }
+
     public static void setSocialNetworkInfo() throws Exception{
 
         String facebookLink = request.params.get("facebook");

app/jobs/AdditionalSettingForShop.java

@@ -14,38 +14,38 @@ public AdditionalSettingForShop(){
 
     }
 
-    public void setWorkkingTime(ShopDTO shop){
+    public void setWorkingTime(ShopDTO shop){
 
         if(shop.monStartTime == null) {
-            shop.monStartTime = "1970-01-01T05:00:00.000Z";
-            shop.monEndTime = "1970-01-01T15:00:00.000Z";
+            shop.monStartTime = "04:20";
+            shop.monEndTime = "16:21";
         }
 
         if(shop.tueStartTime == null) {
-            shop.tueStartTime = "1970-01-01T05:00:00.000Z";
-            shop.tueEndTime = "1970-01-01T15:00:00.000Z";
+            shop.tueStartTime = "04:20";
+            shop.tueEndTime = "16:21";
         }
 
         if(shop.wedStartTime == null) {
-            shop.wedStartTime = "1970-01-01T05:00:00.000Z";
-            shop.wedEndTime = "1970-01-01T15:00:00.000Z";
+            shop.wedStartTime = "04:20";
+            shop.wedEndTime = "16:21";
         }
 
         if(shop.thuStartTime == null) {
-            shop.thuStartTime = "1970-01-01T05:00:00.000Z";
-            shop.thuEndTime = "1970-01-01T15:00:00.000Z";
+            shop.thuStartTime = "04:20";
+            shop.thuEndTime = "16:21";
         }
         if(shop.friStartTime == null) {
-            shop.friStartTime = "1970-01-01T05:00:00.000Z";
-            shop.friEndTime = "1970-01-01T15:00:00.000Z";
+            shop.friStartTime = "04:20";
+            shop.friEndTime = "16:21";
         }
         if(shop.satStartTime == null) {
-            shop.satStartTime = "1970-01-01T05:00:00.000Z";
-            shop.satEndTime = "1970-01-01T15:00:00.000Z";
+            shop.satStartTime = "04:20";
+            shop.satEndTime = "16:21";
         }
         if(shop.sunStartTime == null) {
-            shop.sunStartTime = "1970-01-01T05:00:00.000Z";
-            shop.sunEndTime = "1970-01-01T15:00:00.000Z";
+            shop.sunStartTime = "04:20";
+            shop.sunEndTime = "16:21";
         }
     }