create qrWizard

app/controllers/Application.java

@@ -417,7 +417,7 @@ public static void product(String client, String uuid, String language){
             defaultAdditions = DataBaseQueries.checkIsAdditionDefaultToProduct(product);
             product.defaultAdditions = defaultAdditions;
         }
-        System.out.println("request.params qr_uuid.isEmpty() in Product => " + qr_uuid);
+        System.out.println("request.params qr_uuid.isEmpty() in Product => " + product.isQuantityVisible);
 
         Translation.setTranslationForProduct(language, product);
         Translation.setTranslationForShop(language, shop);
@@ -842,4 +842,10 @@ public static void shopLanding(){
     public static void qrCode(String client){
         renderTemplate("Application/qrCode.html");
     }
+    public static void qrWizard(String client){
+        renderTemplate("Application/qrWizard.html");
+    }
+    public static void testPage(String client){
+        renderTemplate("Application/testPage.html");
+    }
 }

app/controllers/OrderAPI.java

@@ -180,6 +180,9 @@ public static void create(String client, String chosenLanguage) throws Exception
         OrderItemListResult orderItemListResult = _parseOrderItemsList(shoppingCart.items, order);
         order.items = orderItemListResult.orderItemList;
 
+        order.items.stream()
+                .forEach(orderItemDTO -> reduceProductQuantity(orderItemDTO));
+
         DeliveryDTO delivery = shop.delivery;
         System.out.println("deliveryType in order creating => " + shoppingCart.deliveryType);
         if(shoppingCart.deliveryType != null){
@@ -298,6 +301,14 @@ public static void create(String client, String chosenLanguage) throws Exception
         }
     }
 
+    private static void reduceProductQuantity(OrderItemDTO orderItemDTO) {
+        ProductDTO product = ProductDTO.findById(orderItemDTO.productUuid);
+        if (product.quantity > 0) {
+            product.quantity = product.quantity - orderItemDTO.quantity;
+            product.save();
+        }
+    }
+
     private static void validationShoppingCart(String jsonCart, ShoppingCartDTO shoppingCart) throws ParseException {
         if (jsonCart.isEmpty() || shoppingCart == null) {
             return;

app/controllers/ProductAPI.java

@@ -21,7 +21,7 @@ public class ProductAPI extends AuthController {
 
 
     public static void create(String client, String name, String description,
-                              Double price, File fake, Integer mainPhotoIndex,
+                              Double price, Integer quantity, Boolean isQuantityVisible, File fake, Integer mainPhotoIndex,
                               String category,
                               Integer sortOrder, Boolean isActive, Double oldPrice, Integer wholesaleCount, Double wholesalePrice,
                               String nameUk, String descriptionUk, String nameEn, String descriptionEn) throws Exception {
@@ -45,17 +45,18 @@ public static void create(String client, String name, String description,
             images.add(productImage);
         }
 
-        CategoryDTO cat = CategoryDTO.findById(category);
-        ProductDTO product = new ProductDTO(name, description, price, images, shop, cat, wholesaleCount, wholesalePrice);
+        CategoryDTO categoryDTO = CategoryDTO.findById(category);
+        ProductDTO product = new ProductDTO(name, description, price, images, shop, categoryDTO, wholesaleCount, wholesalePrice);
         product.mainImage = images.get(mainPhotoIndex);
         product.isActive = isActive;
         product.sortOrder = sortOrder;
         product.oldPrice = oldPrice;
         product.wholesaleCount = wholesaleCount;
         product.wholesalePrice = wholesalePrice;
+        product.quantity = quantity == null ? 0 : quantity;
+        product.isQuantityVisible = isQuantityVisible;
         product = product.save();
 
-
         List<ProductPropertyDTO> properties = ProductPropertyDTO.find("byCategoryUuidAndProductUuidIsNull", product.categoryUuid).fetch();
         for(ProductPropertyDTO property : properties) {
             ProductPropertyDTO propertyNew = new ProductPropertyDTO();
@@ -157,8 +158,8 @@ public static void list(String client, int page) throws Exception {
         renderJSON(json);
     }
 
-    public static void update(String client, String uuid, String name, String description, Double price, Upload photo,
-                              Integer sortOrder, Boolean isActive, Double oldPrice, String properties, Integer wholesaleCount, Double wholesalePrice) throws Exception {
+    public static void update(String client, String uuid, String name, String description, Double price, Integer quantity, Boolean isQuantityVisible,
+                              Upload photo, Integer sortOrder, Boolean isActive, Double oldPrice, String properties, Integer wholesaleCount, Double wholesalePrice) throws Exception {
         ShopDTO shop = ShopDTO.find("byDomain", client).first();
         if (shop == null) {
             shop = ShopDTO.find("byDomain", "localhost").first();
@@ -211,6 +212,8 @@ public static void update(String client, String uuid, String name, String descri
 
         product.wholesaleCount = wholesaleCount;
         product.wholesalePrice = wholesalePrice;
+        product.quantity = quantity;
+        product.isQuantityVisible = isQuantityVisible;
 
         product.save();
 

app/controllers/UserAPI.java

@@ -45,7 +45,6 @@ public static void register(String email, String password, String passwordConfir
                 forbidden(reason);
             }
 
-
             if (user != null && user.isGoogleSignIn) {
                 UserDTO userWithGivenPhone = UserDTO.find("byPhone", phone).first();
                 if(userWithGivenPhone != null) {

app/controllers/UserDashBoardAPI.java

@@ -1,5 +1,6 @@
 package controllers;
 
+import jobs.AdditionalSettingForShop;
 import models.*;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
@@ -78,6 +79,9 @@ public static void createShop() throws Exception{
         shop.googleMapsApiKey = "AIzaSyAuKg9jszEEgoGfUlIqmd4n9czbQsgcYRM";
         visualSettings.shop = shop;
 
+        AdditionalSettingForShop additionalSettingForShop = new AdditionalSettingForShop();
+        additionalSettingForShop.setWorkingTime(shop);
+
         _appendDomainToList(user.wizard.shopDomain);
         shop.save();
         renderJSON(json(shop));

app/controllers/WizardAPI.java

@@ -67,11 +67,14 @@ public static void upDateWizardDetails() throws Exception{
     }
 
     public static void checkDomainNameAvailability() throws Exception{
-        String domain = request.params.get("shopDomain").toLowerCase();
-
 
 
+        JSONParser parser = new JSONParser();
+        JSONObject jsonBody = (JSONObject) parser.parse(params.get("body"));
+        System.out.println(" checkDomainNameAvailability => " + jsonBody);
 
+        String domain = (String) jsonBody.get("domain");
+        System.out.println("checkDomainNameAvailability => " + domain);
         String domainPath;
         if (Application.isDevEnv) {
             domainPath = ".localhost";
@@ -82,24 +85,34 @@ public static void checkDomainNameAvailability() throws Exception{
         }
 
         if(isDomainNameInvalid(domain)){
-            JsonResponse jsonResponse = new JsonResponse(420, "назва не повинна містити: !, _");
+            JsonResponse jsonResponse = new JsonResponse(421, "Назва не повинна містити: !, _");
             renderJSON(jsonResponse);
         }
 
         String authorizationHeader = request.headers.get("authorization").value();
         String userId = getUserIdFromAuthorization(authorizationHeader);
         System.out.println("String userId " + userId);
+        UserDTO user = UserDTO.find("byUuid", userId).first();
+        String shopName = (String) jsonBody.get("shopName");
+        System.out.println("shopName => " + shopName);
         ShopDTO shop = ShopDTO.find("byDomain", domain).first();
         if (shop == null){
-            String reason = "адреса доступна";
-            JsonResponse jsonResponse = new JsonResponse(421, reason);
-            UserDTO user = UserDTO.find("byUuid", userId).first();
+            String reason = "Адреса доступна";
+            JsonResponse jsonResponse = new JsonResponse(420, reason);
+            if (user.wizard == null){
+                WizardDTO wizardDTO = new WizardDTO();
+                wizardDTO.user = user;
+                user.wizard = wizardDTO;
+                wizardDTO.save();
+            }
             user.wizard.shopDomain = domain;
+            user.wizard.shopName = shopName;
+
             user.wizard.save();
             renderJSON(jsonResponse);
         }
         String reason = "адреса недоступна";
-        JsonResponse jsonResponse = new JsonResponse(420, reason);
+        JsonResponse jsonResponse = new JsonResponse(421, reason);
         renderJSON(jsonResponse);
 
     }
@@ -112,9 +125,20 @@ private static boolean isDomainNameInvalid(String domainName) {
     }
 
     public static void setShopContactInfo() throws Exception{
-        String cityName = request.params.get("cityName");
-        String streetName = request.params.get("streetName");
-        String buildingNumber = request.params.get("buildingNumber");
+        String cityName, streetName, buildingNumber;
+              cityName = request.params.get("cityName");
+              streetName = request.params.get("streetName");
+              buildingNumber = request.params.get("buildingNumber");
+
+        JSONParser parser = new JSONParser();
+        JSONObject jsonBody = (JSONObject) parser.parse(params.get("body"));
+        System.out.println("setShopContactInfo jsonBody\n" + jsonBody);
+
+        if (jsonBody != null){
+            cityName = (String) jsonBody.get("city");
+            streetName = (String) jsonBody.get("street");
+            buildingNumber = (String) jsonBody.get("house");
+        }
 
         System.out.println("setShopContactInfo\n" + cityName + "\n" + streetName + "\n" + buildingNumber);
 
@@ -125,34 +149,36 @@ public static void setShopContactInfo() throws Exception{
         UserDTO user = UserDTO.find("byUuid", userId).first();
         System.out.println("setShopContactInfo get userDTO\n" + userId);
 
-        if(cityName != null){
+        if(cityName != null && !cityName.isEmpty()){
             user.wizard.cityName = cityName;
         }
-        if(streetName != null){
+        if(streetName != null && !streetName.isEmpty()){
             user.wizard.streetName = streetName;
         }
-        if(buildingNumber != null){
+        if(buildingNumber != null && !buildingNumber.isEmpty()){
             user.wizard.buildingNumber =buildingNumber;
         }
 
         user.wizard.save();
-        renderJSON(json(user.wizard));
+        renderJSON(json(new JsonResponse(103, "save")));
     }
 
     public static void setVariantsOfDeliveryAndPaymentTypes() throws Exception{
+        String authorizationHeader = request.headers.get("authorization").value();
+        String userId = getUserIdFromAuthorization(authorizationHeader);
+        UserDTO user = UserDTO.find("byUuid", userId).first();
 
         JSONParser parser = new JSONParser();
         JSONObject jsonBody = (JSONObject) parser.parse(params.get("body"));
         boolean courierDelivery = (boolean) jsonBody.get("courierDelivery");
         boolean postDepartment = (boolean) jsonBody.get("postDepartment");
         boolean selfTake = (boolean) jsonBody.get("selfTake");
-        boolean payCash = true;
-        boolean payOnline = false;
 
-        String authorizationHeader = request.headers.get("authorization").value();
-        String userId = getUserIdFromAuthorization(authorizationHeader);
-        UserDTO user = UserDTO.find("byUuid", userId).first();
-        System.out.println("setVariantsOfDeliveryAndPaymentTypes\n" + user.givenName);
+        boolean payCash = false, payOnline = false;
+        if (jsonBody.get("payCash") != null) payCash = (boolean) jsonBody.get("payCash");
+        if (jsonBody.get("payOnline") != null) payOnline = (boolean) jsonBody.get("payOnline");
+
+        System.out.println("setVariantsOfDeliveryAndPaymentTypes\n" + jsonBody + user.givenName);
 
         user.wizard.courierDelivery = courierDelivery;
         user.wizard.postDepartment = postDepartment;
@@ -206,7 +232,7 @@ public static void signUp() throws Exception {
             if (user != null) {
                 System.out.println("user.with.email.already.exist");
                 String reason = Messages.get("user.with.email.already.exist");
-                JsonResponse jsonResponse = new JsonResponse(420, reason);
+                JsonResponse jsonResponse = new JsonResponse(421, reason);
                 renderJSON(jsonResponse);
             }
 

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:20";
         }
 
         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:20";
         }
 
         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:20";
         }
 
         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:20";
         }
         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:20";
         }
         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:20";
         }
         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:20";
         }
     }
 

app/jobs/WisehandsSetup.java

@@ -44,13 +44,12 @@ public void doJob() throws Exception {
             boolean hasPages = listsPage.size() != 0;
 
             AdditionalSettingForShop additionalSettingForShop = new AdditionalSettingForShop();
-            additionalSettingForShop.setWorkkingTime(shop);
+            additionalSettingForShop.setWorkingTime(shop);
             shop = shop.save();
             if (!hasPages){
               additionalSettingForShop.setPageListForFooter(shop);
             }
         }
-
     }
 
     private void createShop(String shopName, String domain) {

app/models/ProductDTO.java

@@ -1,12 +1,16 @@
 package models;
 
 import com.google.gson.annotations.Expose;
+import json.shoppingcart.LineItem;
 import org.hibernate.annotations.GenericGenerator;
 import play.db.jpa.GenericModel;
+import util.ShoppingCartUtil;
 
 import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
+
 
 @Entity
 public class ProductDTO extends GenericModel {
@@ -59,6 +63,12 @@ public class ProductDTO extends GenericModel {
     @Expose
     public Double wholesalePrice;
 
+    @Expose
+    public int quantity;
+
+    @Expose
+    public Boolean isQuantityVisible = false;
+
     @Expose
     @OneToOne
     public ProductImage mainImage;
@@ -138,12 +148,28 @@ public String formatDecimalOldPrice() {
         if (number != null) {
             float epsilon = 0.004f; // 4 tenths of a cent
             if (Math.abs(Math.round(number) - number) < epsilon) {
-                return String.format("%10.0f", number) + " " + "uah"; // sdb
+                return String.format("%10.0f", number) + " " + "&#8372;"; // sdb
             } else {
-                return String.format("%10.2f", number) + " " + "uah"; // dj_segfault
+                return String.format("%10.2f", number) + " " + "&#8372;"; // dj_segfault
             }
         }
         return "";
     }
 
+    public int getProductQuantity() {
+        List<ShoppingCartDTO> cart = ShoppingCartDTO.findAll();
+        List<LineItem> lineItems = cart.get(cart.size() - 1).items;
+
+        LineItem _lineItem = lineItems.stream()
+                .filter(lineItem -> this.uuid.equals(lineItem.productId))
+                .findAny()
+                .orElse(null);
+        if (_lineItem != null) {
+            return this.quantity - _lineItem.quantity;
+        } else {
+            return this.quantity;
+        }
+
+    }
+
 }

app/models/UserDTO.java

@@ -82,6 +82,7 @@ public UserDTO(String givenName, String familyName, String phone, String email,
         this.phone = phone;
         this.email = email;
         this.password = password;
+        this.token = UUID.randomUUID().toString();
     }
 
 }