diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java index 319e9e108..36bb7164d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java @@ -222,5 +222,7 @@ public interface RetailAppService { JSONObject getClientSubManage(JSONObject device); + JSONObject getCustomerInfo(JSONObject device); + boolean isSubPartner(JSONObject device, String clientMoniker); } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index a02734638..0c32d1df7 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -2435,6 +2435,19 @@ public class RetailAppServiceImp implements RetailAppService { return result; } + public JSONObject getCustomerInfo(JSONObject device) { + JSONObject result = new JSONObject(); + String clientType = device.getString("client_type"); + deviceSupport.findRegister(clientType); + JSONObject client = clientManager.getClientInfo(device.getIntValue("client_id")); + result.put("contact_email", client.getString("contact_email")); + result.put("client_id", client.getString("client_id")); + result.put("contact_person", client.getString("contact_person")); + result.put("country", client.getString("country")); + result.put("state", client.getString("state")); + return result; + } + @Override public boolean isSubPartner(JSONObject device,String clientMoniker) { JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker); diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java index b521280aa..56b24df82 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java @@ -843,4 +843,13 @@ public class RetailAppController { public JSONObject getClientSubManage(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) { return retailAppService.getClientSubManage(device); } + + @GetMapping("/client/customer") + public ModelAndView redirectClientCustomer(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) { + ModelAndView model = new ModelAndView("app/app_customer"); + JSONObject client = retailAppService.getCustomerInfo(device); + model.addObject("client", client); + return model; + } + } diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java index cdb5a557e..015933123 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java @@ -61,6 +61,7 @@ import org.springframework.util.Assert; import org.springframework.util.MimeTypeUtils; import org.springframework.validation.Errors; import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.ServletOutputStream; @@ -577,4 +578,18 @@ public class TestController implements ApplicationEventPublisherAware { } } + @GetMapping("/client/customer") + public ModelAndView redirectClientCustomer() { + JSONObject result = new JSONObject(); + ModelAndView model = new ModelAndView("app/app_customer"); + JSONObject client = clientManager.getClientInfoByMoniker("PINE"); + result.put("contact_email", client.getString("contact_email")); + result.put("client_id", client.getString("client_id")); + result.put("contact_person", client.getString("contact_person")); + result.put("country", client.getString("country")); + result.put("state", client.getString("state")); + model.addObject("client", result); + return model; + } + } diff --git a/src/main/resources/templates/app/app_customer.html b/src/main/resources/templates/app/app_customer.html new file mode 100644 index 000000000..f4b10a712 --- /dev/null +++ b/src/main/resources/templates/app/app_customer.html @@ -0,0 +1,114 @@ + + + + + + RoyalPay + + + + + + + + + + +
+ +
+ + +
+
+
+
+ + + \ No newline at end of file