diff --git a/src/main/java/com/ffii/tls/api/service/AuthenticationService.java b/src/main/java/com/ffii/tbms/api/service/AuthenticationService.java similarity index 100% rename from src/main/java/com/ffii/tls/api/service/AuthenticationService.java rename to src/main/java/com/ffii/tbms/api/service/AuthenticationService.java diff --git a/src/main/java/com/ffii/tls/api/service/CustomerApiService.java b/src/main/java/com/ffii/tbms/api/service/CustomerApiService.java similarity index 100% rename from src/main/java/com/ffii/tls/api/service/CustomerApiService.java rename to src/main/java/com/ffii/tbms/api/service/CustomerApiService.java diff --git a/src/main/java/com/ffii/tls/api/service/MeetingApiService.java b/src/main/java/com/ffii/tbms/api/service/MeetingApiService.java similarity index 100% rename from src/main/java/com/ffii/tls/api/service/MeetingApiService.java rename to src/main/java/com/ffii/tbms/api/service/MeetingApiService.java diff --git a/src/main/java/com/ffii/tls/api/service/OrderApiService.java b/src/main/java/com/ffii/tbms/api/service/OrderApiService.java similarity index 100% rename from src/main/java/com/ffii/tls/api/service/OrderApiService.java rename to src/main/java/com/ffii/tbms/api/service/OrderApiService.java diff --git a/src/main/java/com/ffii/tls/api/web/AuthenticationController.java b/src/main/java/com/ffii/tbms/api/web/AuthenticationController.java similarity index 100% rename from src/main/java/com/ffii/tls/api/web/AuthenticationController.java rename to src/main/java/com/ffii/tbms/api/web/AuthenticationController.java diff --git a/src/main/java/com/ffii/tls/api/web/CustomerApiController.java b/src/main/java/com/ffii/tbms/api/web/CustomerApiController.java similarity index 100% rename from src/main/java/com/ffii/tls/api/web/CustomerApiController.java rename to src/main/java/com/ffii/tbms/api/web/CustomerApiController.java diff --git a/src/main/java/com/ffii/tls/api/web/FileApiController.java b/src/main/java/com/ffii/tbms/api/web/FileApiController.java similarity index 100% rename from src/main/java/com/ffii/tls/api/web/FileApiController.java rename to src/main/java/com/ffii/tbms/api/web/FileApiController.java diff --git a/src/main/java/com/ffii/tls/api/web/MainApiController.java b/src/main/java/com/ffii/tbms/api/web/MainApiController.java similarity index 100% rename from src/main/java/com/ffii/tls/api/web/MainApiController.java rename to src/main/java/com/ffii/tbms/api/web/MainApiController.java diff --git a/src/main/java/com/ffii/tls/api/web/MeetingApiController.java b/src/main/java/com/ffii/tbms/api/web/MeetingApiController.java similarity index 100% rename from src/main/java/com/ffii/tls/api/web/MeetingApiController.java rename to src/main/java/com/ffii/tbms/api/web/MeetingApiController.java diff --git a/src/main/java/com/ffii/tls/api/web/OrderApiController.java b/src/main/java/com/ffii/tbms/api/web/OrderApiController.java similarity index 100% rename from src/main/java/com/ffii/tls/api/web/OrderApiController.java rename to src/main/java/com/ffii/tbms/api/web/OrderApiController.java diff --git a/src/main/java/com/ffii/tls/common/MaterialBand.java b/src/main/java/com/ffii/tbms/common/MaterialBand.java similarity index 100% rename from src/main/java/com/ffii/tls/common/MaterialBand.java rename to src/main/java/com/ffii/tbms/common/MaterialBand.java diff --git a/src/main/java/com/ffii/tls/common/MaterialItem.java b/src/main/java/com/ffii/tbms/common/MaterialItem.java similarity index 100% rename from src/main/java/com/ffii/tls/common/MaterialItem.java rename to src/main/java/com/ffii/tbms/common/MaterialItem.java diff --git a/src/main/java/com/ffii/tls/common/dao/MaterialBandDao.java b/src/main/java/com/ffii/tbms/common/dao/MaterialBandDao.java similarity index 100% rename from src/main/java/com/ffii/tls/common/dao/MaterialBandDao.java rename to src/main/java/com/ffii/tbms/common/dao/MaterialBandDao.java diff --git a/src/main/java/com/ffii/tls/common/dao/MaterialItemDao.java b/src/main/java/com/ffii/tbms/common/dao/MaterialItemDao.java similarity index 100% rename from src/main/java/com/ffii/tls/common/dao/MaterialItemDao.java rename to src/main/java/com/ffii/tbms/common/dao/MaterialItemDao.java diff --git a/src/main/java/com/ffii/tls/common/service/MaterialService.java b/src/main/java/com/ffii/tbms/common/service/MaterialService.java similarity index 100% rename from src/main/java/com/ffii/tls/common/service/MaterialService.java rename to src/main/java/com/ffii/tbms/common/service/MaterialService.java diff --git a/src/main/java/com/ffii/tls/common/web/MaterialController.java b/src/main/java/com/ffii/tbms/common/web/MaterialController.java similarity index 100% rename from src/main/java/com/ffii/tls/common/web/MaterialController.java rename to src/main/java/com/ffii/tbms/common/web/MaterialController.java diff --git a/src/main/java/com/ffii/tls/counter/IdCounter.java b/src/main/java/com/ffii/tbms/counter/IdCounter.java similarity index 100% rename from src/main/java/com/ffii/tls/counter/IdCounter.java rename to src/main/java/com/ffii/tbms/counter/IdCounter.java diff --git a/src/main/java/com/ffii/tls/counter/dao/IdCounterDao.java b/src/main/java/com/ffii/tbms/counter/dao/IdCounterDao.java similarity index 100% rename from src/main/java/com/ffii/tls/counter/dao/IdCounterDao.java rename to src/main/java/com/ffii/tbms/counter/dao/IdCounterDao.java diff --git a/src/main/java/com/ffii/tls/counter/service/IdCounterService.java b/src/main/java/com/ffii/tbms/counter/service/IdCounterService.java similarity index 100% rename from src/main/java/com/ffii/tls/counter/service/IdCounterService.java rename to src/main/java/com/ffii/tbms/counter/service/IdCounterService.java diff --git a/src/main/java/com/ffii/tls/customer/Customer.java b/src/main/java/com/ffii/tbms/customer/Customer.java similarity index 100% rename from src/main/java/com/ffii/tls/customer/Customer.java rename to src/main/java/com/ffii/tbms/customer/Customer.java diff --git a/src/main/java/com/ffii/tls/customer/dao/CustomerDao.java b/src/main/java/com/ffii/tbms/customer/dao/CustomerDao.java similarity index 100% rename from src/main/java/com/ffii/tls/customer/dao/CustomerDao.java rename to src/main/java/com/ffii/tbms/customer/dao/CustomerDao.java diff --git a/src/main/java/com/ffii/tls/customer/service/CustomerService.java b/src/main/java/com/ffii/tbms/customer/service/CustomerService.java similarity index 100% rename from src/main/java/com/ffii/tls/customer/service/CustomerService.java rename to src/main/java/com/ffii/tbms/customer/service/CustomerService.java diff --git a/src/main/java/com/ffii/tls/customer/web/CustomerController.java b/src/main/java/com/ffii/tbms/customer/web/CustomerController.java similarity index 100% rename from src/main/java/com/ffii/tls/customer/web/CustomerController.java rename to src/main/java/com/ffii/tbms/customer/web/CustomerController.java diff --git a/src/main/java/com/ffii/tls/example/Example.java b/src/main/java/com/ffii/tbms/example/Example.java similarity index 100% rename from src/main/java/com/ffii/tls/example/Example.java rename to src/main/java/com/ffii/tbms/example/Example.java diff --git a/src/main/java/com/ffii/tls/example/dao/ExampleDao.java b/src/main/java/com/ffii/tbms/example/dao/ExampleDao.java similarity index 100% rename from src/main/java/com/ffii/tls/example/dao/ExampleDao.java rename to src/main/java/com/ffii/tbms/example/dao/ExampleDao.java diff --git a/src/main/java/com/ffii/tls/example/service/ExampleService.java b/src/main/java/com/ffii/tbms/example/service/ExampleService.java similarity index 100% rename from src/main/java/com/ffii/tls/example/service/ExampleService.java rename to src/main/java/com/ffii/tbms/example/service/ExampleService.java diff --git a/src/main/java/com/ffii/tls/example/web/ExampleController.java b/src/main/java/com/ffii/tbms/example/web/ExampleController.java similarity index 100% rename from src/main/java/com/ffii/tls/example/web/ExampleController.java rename to src/main/java/com/ffii/tbms/example/web/ExampleController.java diff --git a/src/main/java/com/ffii/tls/file/File.java b/src/main/java/com/ffii/tbms/file/File.java similarity index 100% rename from src/main/java/com/ffii/tls/file/File.java rename to src/main/java/com/ffii/tbms/file/File.java diff --git a/src/main/java/com/ffii/tls/file/FileBlob.java b/src/main/java/com/ffii/tbms/file/FileBlob.java similarity index 100% rename from src/main/java/com/ffii/tls/file/FileBlob.java rename to src/main/java/com/ffii/tbms/file/FileBlob.java diff --git a/src/main/java/com/ffii/tls/file/FileRef.java b/src/main/java/com/ffii/tbms/file/FileRef.java similarity index 100% rename from src/main/java/com/ffii/tls/file/FileRef.java rename to src/main/java/com/ffii/tbms/file/FileRef.java diff --git a/src/main/java/com/ffii/tls/file/FileRefType.java b/src/main/java/com/ffii/tbms/file/FileRefType.java similarity index 100% rename from src/main/java/com/ffii/tls/file/FileRefType.java rename to src/main/java/com/ffii/tbms/file/FileRefType.java diff --git a/src/main/java/com/ffii/tls/file/dao/FileBlobDao.java b/src/main/java/com/ffii/tbms/file/dao/FileBlobDao.java similarity index 100% rename from src/main/java/com/ffii/tls/file/dao/FileBlobDao.java rename to src/main/java/com/ffii/tbms/file/dao/FileBlobDao.java diff --git a/src/main/java/com/ffii/tls/file/dao/FileDao.java b/src/main/java/com/ffii/tbms/file/dao/FileDao.java similarity index 100% rename from src/main/java/com/ffii/tls/file/dao/FileDao.java rename to src/main/java/com/ffii/tbms/file/dao/FileDao.java diff --git a/src/main/java/com/ffii/tls/file/dao/FileRefDao.java b/src/main/java/com/ffii/tbms/file/dao/FileRefDao.java similarity index 100% rename from src/main/java/com/ffii/tls/file/dao/FileRefDao.java rename to src/main/java/com/ffii/tbms/file/dao/FileRefDao.java diff --git a/src/main/java/com/ffii/tls/file/service/FileService.java b/src/main/java/com/ffii/tbms/file/service/FileService.java similarity index 100% rename from src/main/java/com/ffii/tls/file/service/FileService.java rename to src/main/java/com/ffii/tbms/file/service/FileService.java diff --git a/src/main/java/com/ffii/tls/file/web/DeleteFileController.java b/src/main/java/com/ffii/tbms/file/web/DeleteFileController.java similarity index 100% rename from src/main/java/com/ffii/tls/file/web/DeleteFileController.java rename to src/main/java/com/ffii/tbms/file/web/DeleteFileController.java diff --git a/src/main/java/com/ffii/tls/file/web/DownloadFileController.java b/src/main/java/com/ffii/tbms/file/web/DownloadFileController.java similarity index 100% rename from src/main/java/com/ffii/tls/file/web/DownloadFileController.java rename to src/main/java/com/ffii/tbms/file/web/DownloadFileController.java diff --git a/src/main/java/com/ffii/tls/file/web/FileJsonController.java b/src/main/java/com/ffii/tbms/file/web/FileJsonController.java similarity index 100% rename from src/main/java/com/ffii/tls/file/web/FileJsonController.java rename to src/main/java/com/ffii/tbms/file/web/FileJsonController.java diff --git a/src/main/java/com/ffii/tls/file/web/UploadFileController.java b/src/main/java/com/ffii/tbms/file/web/UploadFileController.java similarity index 100% rename from src/main/java/com/ffii/tls/file/web/UploadFileController.java rename to src/main/java/com/ffii/tbms/file/web/UploadFileController.java diff --git a/src/main/java/com/ffii/tls/log/LogUtils.java b/src/main/java/com/ffii/tbms/log/LogUtils.java similarity index 100% rename from src/main/java/com/ffii/tls/log/LogUtils.java rename to src/main/java/com/ffii/tbms/log/LogUtils.java diff --git a/src/main/java/com/ffii/tls/log/ScheduledTaskLog.java b/src/main/java/com/ffii/tbms/log/ScheduledTaskLog.java similarity index 100% rename from src/main/java/com/ffii/tls/log/ScheduledTaskLog.java rename to src/main/java/com/ffii/tbms/log/ScheduledTaskLog.java diff --git a/src/main/java/com/ffii/tls/log/UsageLog.java b/src/main/java/com/ffii/tbms/log/UsageLog.java similarity index 100% rename from src/main/java/com/ffii/tls/log/UsageLog.java rename to src/main/java/com/ffii/tbms/log/UsageLog.java diff --git a/src/main/java/com/ffii/tls/log/dao/ScheduledTaskLogDao.java b/src/main/java/com/ffii/tbms/log/dao/ScheduledTaskLogDao.java similarity index 100% rename from src/main/java/com/ffii/tls/log/dao/ScheduledTaskLogDao.java rename to src/main/java/com/ffii/tbms/log/dao/ScheduledTaskLogDao.java diff --git a/src/main/java/com/ffii/tls/log/service/AuditLogService.java b/src/main/java/com/ffii/tbms/log/service/AuditLogService.java similarity index 100% rename from src/main/java/com/ffii/tls/log/service/AuditLogService.java rename to src/main/java/com/ffii/tbms/log/service/AuditLogService.java diff --git a/src/main/java/com/ffii/tls/log/service/ScheduledTaskLogService.java b/src/main/java/com/ffii/tbms/log/service/ScheduledTaskLogService.java similarity index 100% rename from src/main/java/com/ffii/tls/log/service/ScheduledTaskLogService.java rename to src/main/java/com/ffii/tbms/log/service/ScheduledTaskLogService.java diff --git a/src/main/java/com/ffii/tls/log/service/UsageLogService.java b/src/main/java/com/ffii/tbms/log/service/UsageLogService.java similarity index 100% rename from src/main/java/com/ffii/tls/log/service/UsageLogService.java rename to src/main/java/com/ffii/tbms/log/service/UsageLogService.java diff --git a/src/main/java/com/ffii/tls/log/web/AuditLogController.java b/src/main/java/com/ffii/tbms/log/web/AuditLogController.java similarity index 100% rename from src/main/java/com/ffii/tls/log/web/AuditLogController.java rename to src/main/java/com/ffii/tbms/log/web/AuditLogController.java diff --git a/src/main/java/com/ffii/tls/log/web/ScheduledTaskLogController.java b/src/main/java/com/ffii/tbms/log/web/ScheduledTaskLogController.java similarity index 100% rename from src/main/java/com/ffii/tls/log/web/ScheduledTaskLogController.java rename to src/main/java/com/ffii/tbms/log/web/ScheduledTaskLogController.java diff --git a/src/main/java/com/ffii/tls/mail/MailUtils.java b/src/main/java/com/ffii/tbms/mail/MailUtils.java similarity index 100% rename from src/main/java/com/ffii/tls/mail/MailUtils.java rename to src/main/java/com/ffii/tbms/mail/MailUtils.java diff --git a/src/main/java/com/ffii/tls/mail/service/MailService.java b/src/main/java/com/ffii/tbms/mail/service/MailService.java similarity index 100% rename from src/main/java/com/ffii/tls/mail/service/MailService.java rename to src/main/java/com/ffii/tbms/mail/service/MailService.java diff --git a/src/main/java/com/ffii/tls/meeting/Meeting.java b/src/main/java/com/ffii/tbms/meeting/Meeting.java similarity index 100% rename from src/main/java/com/ffii/tls/meeting/Meeting.java rename to src/main/java/com/ffii/tbms/meeting/Meeting.java diff --git a/src/main/java/com/ffii/tls/meeting/dao/MeetingDao.java b/src/main/java/com/ffii/tbms/meeting/dao/MeetingDao.java similarity index 100% rename from src/main/java/com/ffii/tls/meeting/dao/MeetingDao.java rename to src/main/java/com/ffii/tbms/meeting/dao/MeetingDao.java diff --git a/src/main/java/com/ffii/tls/meeting/service/MeetingService.java b/src/main/java/com/ffii/tbms/meeting/service/MeetingService.java similarity index 100% rename from src/main/java/com/ffii/tls/meeting/service/MeetingService.java rename to src/main/java/com/ffii/tbms/meeting/service/MeetingService.java diff --git a/src/main/java/com/ffii/tls/meeting/web/MeetingController.java b/src/main/java/com/ffii/tbms/meeting/web/MeetingController.java similarity index 100% rename from src/main/java/com/ffii/tls/meeting/web/MeetingController.java rename to src/main/java/com/ffii/tbms/meeting/web/MeetingController.java diff --git a/src/main/java/com/ffii/tls/message/Message.java b/src/main/java/com/ffii/tbms/message/Message.java similarity index 100% rename from src/main/java/com/ffii/tls/message/Message.java rename to src/main/java/com/ffii/tbms/message/Message.java diff --git a/src/main/java/com/ffii/tls/message/dao/MessageDao.java b/src/main/java/com/ffii/tbms/message/dao/MessageDao.java similarity index 100% rename from src/main/java/com/ffii/tls/message/dao/MessageDao.java rename to src/main/java/com/ffii/tbms/message/dao/MessageDao.java diff --git a/src/main/java/com/ffii/tls/message/service/MessageService.java b/src/main/java/com/ffii/tbms/message/service/MessageService.java similarity index 100% rename from src/main/java/com/ffii/tls/message/service/MessageService.java rename to src/main/java/com/ffii/tbms/message/service/MessageService.java diff --git a/src/main/java/com/ffii/tls/message/web/MessageController.java b/src/main/java/com/ffii/tbms/message/web/MessageController.java similarity index 100% rename from src/main/java/com/ffii/tls/message/web/MessageController.java rename to src/main/java/com/ffii/tbms/message/web/MessageController.java diff --git a/src/main/java/com/ffii/tls/order/Order.java b/src/main/java/com/ffii/tbms/order/Order.java similarity index 100% rename from src/main/java/com/ffii/tls/order/Order.java rename to src/main/java/com/ffii/tbms/order/Order.java diff --git a/src/main/java/com/ffii/tls/order/OrderItem.java b/src/main/java/com/ffii/tbms/order/OrderItem.java similarity index 100% rename from src/main/java/com/ffii/tls/order/OrderItem.java rename to src/main/java/com/ffii/tbms/order/OrderItem.java diff --git a/src/main/java/com/ffii/tls/order/Payment.java b/src/main/java/com/ffii/tbms/order/Payment.java similarity index 100% rename from src/main/java/com/ffii/tls/order/Payment.java rename to src/main/java/com/ffii/tbms/order/Payment.java diff --git a/src/main/java/com/ffii/tls/order/dao/OrderDao.java b/src/main/java/com/ffii/tbms/order/dao/OrderDao.java similarity index 100% rename from src/main/java/com/ffii/tls/order/dao/OrderDao.java rename to src/main/java/com/ffii/tbms/order/dao/OrderDao.java diff --git a/src/main/java/com/ffii/tls/order/dao/OrderItemDao.java b/src/main/java/com/ffii/tbms/order/dao/OrderItemDao.java similarity index 100% rename from src/main/java/com/ffii/tls/order/dao/OrderItemDao.java rename to src/main/java/com/ffii/tbms/order/dao/OrderItemDao.java diff --git a/src/main/java/com/ffii/tls/order/dao/PaymentDao.java b/src/main/java/com/ffii/tbms/order/dao/PaymentDao.java similarity index 100% rename from src/main/java/com/ffii/tls/order/dao/PaymentDao.java rename to src/main/java/com/ffii/tbms/order/dao/PaymentDao.java diff --git a/src/main/java/com/ffii/tls/order/service/InvoiceService.java b/src/main/java/com/ffii/tbms/order/service/InvoiceService.java similarity index 98% rename from src/main/java/com/ffii/tls/order/service/InvoiceService.java rename to src/main/java/com/ffii/tbms/order/service/InvoiceService.java index fbf1821..687746f 100644 --- a/src/main/java/com/ffii/tls/order/service/InvoiceService.java +++ b/src/main/java/com/ffii/tbms/order/service/InvoiceService.java @@ -122,12 +122,6 @@ public class InvoiceService extends AbstractService { public Map getInvoicePdfParams(int orderId){ Map params = search(orderId); - - //For Ricky - /* - String path = this.getClass().getClassLoader().getResource("").getPath() + "../report/dream_bespoke_icon.png"; - */ - FileBlob blob = sysGroupService.getIconBlob(); Map sysGroup = sysGroupService.find(SecurityUtils.getUser().getSysGroupId()); diff --git a/src/main/java/com/ffii/tls/order/service/OrderItemService.java b/src/main/java/com/ffii/tbms/order/service/OrderItemService.java similarity index 100% rename from src/main/java/com/ffii/tls/order/service/OrderItemService.java rename to src/main/java/com/ffii/tbms/order/service/OrderItemService.java diff --git a/src/main/java/com/ffii/tls/order/service/OrderService.java b/src/main/java/com/ffii/tbms/order/service/OrderService.java similarity index 100% rename from src/main/java/com/ffii/tls/order/service/OrderService.java rename to src/main/java/com/ffii/tbms/order/service/OrderService.java diff --git a/src/main/java/com/ffii/tls/order/service/PaymentService.java b/src/main/java/com/ffii/tbms/order/service/PaymentService.java similarity index 100% rename from src/main/java/com/ffii/tls/order/service/PaymentService.java rename to src/main/java/com/ffii/tbms/order/service/PaymentService.java diff --git a/src/main/java/com/ffii/tls/order/web/InvoiceController.java b/src/main/java/com/ffii/tbms/order/web/InvoiceController.java similarity index 98% rename from src/main/java/com/ffii/tls/order/web/InvoiceController.java rename to src/main/java/com/ffii/tbms/order/web/InvoiceController.java index 3f10aa8..b7962be 100644 --- a/src/main/java/com/ffii/tls/order/web/InvoiceController.java +++ b/src/main/java/com/ffii/tbms/order/web/InvoiceController.java @@ -156,7 +156,7 @@ public class InvoiceController extends AbstractController { @RequestMapping(value = "/invoice.pdf", method = { RequestMethod.GET,RequestMethod.POST }) - public ModelAndView DreamBespokeInvoice(Model model, HttpServletRequest request, HttpServletResponse response, + public ModelAndView invoicePdf(Model model, HttpServletRequest request, HttpServletResponse response, @RequestParam int orderId) throws Exception { Map params = invoiceService.getInvoicePdfParams(orderId); diff --git a/src/main/java/com/ffii/tls/order/web/OrderController.java b/src/main/java/com/ffii/tbms/order/web/OrderController.java similarity index 100% rename from src/main/java/com/ffii/tls/order/web/OrderController.java rename to src/main/java/com/ffii/tbms/order/web/OrderController.java diff --git a/src/main/java/com/ffii/tls/order/web/OrderItemController.java b/src/main/java/com/ffii/tbms/order/web/OrderItemController.java similarity index 100% rename from src/main/java/com/ffii/tls/order/web/OrderItemController.java rename to src/main/java/com/ffii/tbms/order/web/OrderItemController.java diff --git a/src/main/java/com/ffii/tls/order/web/PaymentController.java b/src/main/java/com/ffii/tbms/order/web/PaymentController.java similarity index 100% rename from src/main/java/com/ffii/tls/order/web/PaymentController.java rename to src/main/java/com/ffii/tbms/order/web/PaymentController.java diff --git a/src/main/java/com/ffii/tls/reports/service/AuditLogExportService.java b/src/main/java/com/ffii/tbms/reports/service/AuditLogExportService.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/service/AuditLogExportService.java rename to src/main/java/com/ffii/tbms/reports/service/AuditLogExportService.java diff --git a/src/main/java/com/ffii/tls/reports/service/CustomerFirstOrderReportService.java b/src/main/java/com/ffii/tbms/reports/service/CustomerFirstOrderReportService.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/service/CustomerFirstOrderReportService.java rename to src/main/java/com/ffii/tbms/reports/service/CustomerFirstOrderReportService.java diff --git a/src/main/java/com/ffii/tls/reports/service/CustomerReportService.java b/src/main/java/com/ffii/tbms/reports/service/CustomerReportService.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/service/CustomerReportService.java rename to src/main/java/com/ffii/tbms/reports/service/CustomerReportService.java diff --git a/src/main/java/com/ffii/tls/reports/service/OrderReportService.java b/src/main/java/com/ffii/tbms/reports/service/OrderReportService.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/service/OrderReportService.java rename to src/main/java/com/ffii/tbms/reports/service/OrderReportService.java diff --git a/src/main/java/com/ffii/tls/reports/service/OutstandingReportService.java b/src/main/java/com/ffii/tbms/reports/service/OutstandingReportService.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/service/OutstandingReportService.java rename to src/main/java/com/ffii/tbms/reports/service/OutstandingReportService.java diff --git a/src/main/java/com/ffii/tls/reports/service/PaymentReportService.java b/src/main/java/com/ffii/tbms/reports/service/PaymentReportService.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/service/PaymentReportService.java rename to src/main/java/com/ffii/tbms/reports/service/PaymentReportService.java diff --git a/src/main/java/com/ffii/tls/reports/view/AuditLogExportExcelView.java b/src/main/java/com/ffii/tbms/reports/view/AuditLogExportExcelView.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/view/AuditLogExportExcelView.java rename to src/main/java/com/ffii/tbms/reports/view/AuditLogExportExcelView.java diff --git a/src/main/java/com/ffii/tls/reports/view/CustomerFirstOrderReportExcelView.java b/src/main/java/com/ffii/tbms/reports/view/CustomerFirstOrderReportExcelView.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/view/CustomerFirstOrderReportExcelView.java rename to src/main/java/com/ffii/tbms/reports/view/CustomerFirstOrderReportExcelView.java diff --git a/src/main/java/com/ffii/tls/reports/view/CustomerReportExcelView.java b/src/main/java/com/ffii/tbms/reports/view/CustomerReportExcelView.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/view/CustomerReportExcelView.java rename to src/main/java/com/ffii/tbms/reports/view/CustomerReportExcelView.java diff --git a/src/main/java/com/ffii/tls/reports/view/OrderReportExcelView.java b/src/main/java/com/ffii/tbms/reports/view/OrderReportExcelView.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/view/OrderReportExcelView.java rename to src/main/java/com/ffii/tbms/reports/view/OrderReportExcelView.java diff --git a/src/main/java/com/ffii/tls/reports/view/OutstandingReportExcelView.java b/src/main/java/com/ffii/tbms/reports/view/OutstandingReportExcelView.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/view/OutstandingReportExcelView.java rename to src/main/java/com/ffii/tbms/reports/view/OutstandingReportExcelView.java diff --git a/src/main/java/com/ffii/tls/reports/view/PaymentReportExcelView.java b/src/main/java/com/ffii/tbms/reports/view/PaymentReportExcelView.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/view/PaymentReportExcelView.java rename to src/main/java/com/ffii/tbms/reports/view/PaymentReportExcelView.java diff --git a/src/main/java/com/ffii/tls/reports/web/AuditLogExportController.java b/src/main/java/com/ffii/tbms/reports/web/AuditLogExportController.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/web/AuditLogExportController.java rename to src/main/java/com/ffii/tbms/reports/web/AuditLogExportController.java diff --git a/src/main/java/com/ffii/tls/reports/web/CustomerFirstOrderReportController.java b/src/main/java/com/ffii/tbms/reports/web/CustomerFirstOrderReportController.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/web/CustomerFirstOrderReportController.java rename to src/main/java/com/ffii/tbms/reports/web/CustomerFirstOrderReportController.java diff --git a/src/main/java/com/ffii/tls/reports/web/CustomerReportController.java b/src/main/java/com/ffii/tbms/reports/web/CustomerReportController.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/web/CustomerReportController.java rename to src/main/java/com/ffii/tbms/reports/web/CustomerReportController.java diff --git a/src/main/java/com/ffii/tls/reports/web/MeasurementSheetController.java b/src/main/java/com/ffii/tbms/reports/web/MeasurementSheetController.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/web/MeasurementSheetController.java rename to src/main/java/com/ffii/tbms/reports/web/MeasurementSheetController.java diff --git a/src/main/java/com/ffii/tls/reports/web/OrderReportController.java b/src/main/java/com/ffii/tbms/reports/web/OrderReportController.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/web/OrderReportController.java rename to src/main/java/com/ffii/tbms/reports/web/OrderReportController.java diff --git a/src/main/java/com/ffii/tls/reports/web/OutstandingReportController.java b/src/main/java/com/ffii/tbms/reports/web/OutstandingReportController.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/web/OutstandingReportController.java rename to src/main/java/com/ffii/tbms/reports/web/OutstandingReportController.java diff --git a/src/main/java/com/ffii/tls/reports/web/PaymentReportController.java b/src/main/java/com/ffii/tbms/reports/web/PaymentReportController.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/web/PaymentReportController.java rename to src/main/java/com/ffii/tbms/reports/web/PaymentReportController.java diff --git a/src/main/java/com/ffii/tls/reports/web/PreviewController.java b/src/main/java/com/ffii/tbms/reports/web/PreviewController.java similarity index 100% rename from src/main/java/com/ffii/tls/reports/web/PreviewController.java rename to src/main/java/com/ffii/tbms/reports/web/PreviewController.java diff --git a/src/main/java/com/ffii/tls/root/web/HomeController.java b/src/main/java/com/ffii/tbms/root/web/HomeController.java similarity index 100% rename from src/main/java/com/ffii/tls/root/web/HomeController.java rename to src/main/java/com/ffii/tbms/root/web/HomeController.java diff --git a/src/main/java/com/ffii/tls/root/web/IndexController.java b/src/main/java/com/ffii/tbms/root/web/IndexController.java similarity index 100% rename from src/main/java/com/ffii/tls/root/web/IndexController.java rename to src/main/java/com/ffii/tbms/root/web/IndexController.java diff --git a/src/main/java/com/ffii/tls/root/web/LocaleController.java b/src/main/java/com/ffii/tbms/root/web/LocaleController.java similarity index 100% rename from src/main/java/com/ffii/tls/root/web/LocaleController.java rename to src/main/java/com/ffii/tbms/root/web/LocaleController.java diff --git a/src/main/java/com/ffii/tls/setting/web/SettingsController.java b/src/main/java/com/ffii/tbms/setting/web/SettingsController.java similarity index 100% rename from src/main/java/com/ffii/tls/setting/web/SettingsController.java rename to src/main/java/com/ffii/tbms/setting/web/SettingsController.java diff --git a/src/main/java/com/ffii/tls/sjs/web/SjsController.java b/src/main/java/com/ffii/tbms/sjs/web/SjsController.java similarity index 100% rename from src/main/java/com/ffii/tls/sjs/web/SjsController.java rename to src/main/java/com/ffii/tbms/sjs/web/SjsController.java diff --git a/src/main/java/com/ffii/tls/user/Group.java b/src/main/java/com/ffii/tbms/user/Group.java similarity index 100% rename from src/main/java/com/ffii/tls/user/Group.java rename to src/main/java/com/ffii/tbms/user/Group.java diff --git a/src/main/java/com/ffii/tls/user/UserSetting.java b/src/main/java/com/ffii/tbms/user/UserSetting.java similarity index 100% rename from src/main/java/com/ffii/tls/user/UserSetting.java rename to src/main/java/com/ffii/tbms/user/UserSetting.java diff --git a/src/main/java/com/ffii/tls/user/dao/GroupDao.java b/src/main/java/com/ffii/tbms/user/dao/GroupDao.java similarity index 100% rename from src/main/java/com/ffii/tls/user/dao/GroupDao.java rename to src/main/java/com/ffii/tbms/user/dao/GroupDao.java diff --git a/src/main/java/com/ffii/tls/user/dao/UserDao.java b/src/main/java/com/ffii/tbms/user/dao/UserDao.java similarity index 100% rename from src/main/java/com/ffii/tls/user/dao/UserDao.java rename to src/main/java/com/ffii/tbms/user/dao/UserDao.java diff --git a/src/main/java/com/ffii/tls/user/service/AuthService.java b/src/main/java/com/ffii/tbms/user/service/AuthService.java similarity index 100% rename from src/main/java/com/ffii/tls/user/service/AuthService.java rename to src/main/java/com/ffii/tbms/user/service/AuthService.java diff --git a/src/main/java/com/ffii/tls/user/service/GroupService.java b/src/main/java/com/ffii/tbms/user/service/GroupService.java similarity index 100% rename from src/main/java/com/ffii/tls/user/service/GroupService.java rename to src/main/java/com/ffii/tbms/user/service/GroupService.java diff --git a/src/main/java/com/ffii/tls/user/service/SysGroupService.java b/src/main/java/com/ffii/tbms/user/service/SysGroupService.java similarity index 100% rename from src/main/java/com/ffii/tls/user/service/SysGroupService.java rename to src/main/java/com/ffii/tbms/user/service/SysGroupService.java diff --git a/src/main/java/com/ffii/tls/user/service/UserService.java b/src/main/java/com/ffii/tbms/user/service/UserService.java similarity index 100% rename from src/main/java/com/ffii/tls/user/service/UserService.java rename to src/main/java/com/ffii/tbms/user/service/UserService.java diff --git a/src/main/java/com/ffii/tls/user/service/UserSettingsService.java b/src/main/java/com/ffii/tbms/user/service/UserSettingsService.java similarity index 100% rename from src/main/java/com/ffii/tls/user/service/UserSettingsService.java rename to src/main/java/com/ffii/tbms/user/service/UserSettingsService.java diff --git a/src/main/java/com/ffii/tls/user/web/GroupController.java b/src/main/java/com/ffii/tbms/user/web/GroupController.java similarity index 100% rename from src/main/java/com/ffii/tls/user/web/GroupController.java rename to src/main/java/com/ffii/tbms/user/web/GroupController.java diff --git a/src/main/java/com/ffii/tls/user/web/SysGroupController.java b/src/main/java/com/ffii/tbms/user/web/SysGroupController.java similarity index 100% rename from src/main/java/com/ffii/tls/user/web/SysGroupController.java rename to src/main/java/com/ffii/tbms/user/web/SysGroupController.java diff --git a/src/main/java/com/ffii/tls/user/web/UserAuthController.java b/src/main/java/com/ffii/tbms/user/web/UserAuthController.java similarity index 100% rename from src/main/java/com/ffii/tls/user/web/UserAuthController.java rename to src/main/java/com/ffii/tbms/user/web/UserAuthController.java diff --git a/src/main/java/com/ffii/tls/user/web/UserController.java b/src/main/java/com/ffii/tbms/user/web/UserController.java similarity index 100% rename from src/main/java/com/ffii/tls/user/web/UserController.java rename to src/main/java/com/ffii/tbms/user/web/UserController.java diff --git a/src/main/webapp/WEB-INF/mail.xml b/src/main/webapp/WEB-INF/mail.xml index 5d7f678..565a3ea 100644 --- a/src/main/webapp/WEB-INF/mail.xml +++ b/src/main/webapp/WEB-INF/mail.xml @@ -8,8 +8,8 @@ - - + + true diff --git a/src/main/webapp/WEB-INF/mail/invoiceTemplateMail.ftl b/src/main/webapp/WEB-INF/mail/invoiceTemplateMail.ftl index 78e9499..4a6fd28 100644 --- a/src/main/webapp/WEB-INF/mail/invoiceTemplateMail.ftl +++ b/src/main/webapp/WEB-INF/mail/invoiceTemplateMail.ftl @@ -9,6 +9,6 @@ Dear Customer,

Order No.: {$orderNo}
Order Date: {$orderDate}
Order Amount: {$amount}

Please find attached invoice for more details, Thank you.

Yours faithfully,

-2fi business solutions limited
Suite 1405, 14/F, Century Square, 1-13 D'Aguilar Street, Central, Hong Kong 
Tel: (852) 2804-6788 Fax: (852) 2804-6997
Email: sales@dreambespoke.com
+2Fi Business Solutions Limited
Unit C2, 3/F, Block 2 Camel Paint Building, 62 Hoi Yuen Road, Kwun Tong, Kowloon, Hong Kong 
Tel: (852) 2415 2081
Email: sales@2fi-solutions.com.hk
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/mail/invoiceTemplateMail2.ftl b/src/main/webapp/WEB-INF/mail/invoiceTemplateMail2.ftl deleted file mode 100644 index ee67459..0000000 --- a/src/main/webapp/WEB-INF/mail/invoiceTemplateMail2.ftl +++ /dev/null @@ -1,14 +0,0 @@ -<#import "/spring.ftl" as spring> - - - - - - - - -Dear Customer,

Order No.: {$orderNo}
Order Date: {$orderDate}
Order Amount: {$amount}

Please find attached invoice for more details, Thank you.

-Yours faithfully,

-Dream Bespoke Limited
Suite 1405, 14/F, Century Square, 1-13 D'Aguilar Street, Central, Hong Kong 
Tel: (852) 2804-6788 Fax: (852) 2804-6997
Email: sales@dreambespoke.com
- - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/report/dreamBespokeInvoiceTemp.jrxml b/src/main/webapp/WEB-INF/report/dreamBespokeInvoiceTemp.jrxml deleted file mode 100644 index e4950b5..0000000 --- a/src/main/webapp/WEB-INF/report/dreamBespokeInvoiceTemp.jrxml +++ /dev/null @@ -1,353 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - <band height="151" splitType="Stretch"> - <staticText> - <reportElement x="0" y="80" width="555" height="31" uuid="5f97a73f-7f05-4694-aa31-8c30a0be1c84"/> - <textElement textAlignment="Center"> - <font size="24" isBold="false"/> - </textElement> - <text><![CDATA[Dream Bespoke Limited]]></text> - </staticText> - <staticText> - <reportElement x="0" y="113" width="555" height="38" uuid="fe9c6e35-6cdf-471d-be30-39ddb39f8896"/> - <textElement textAlignment="Center" markup="html"> - <font size="12"/> - </textElement> - <text><![CDATA[Suite 1405, 14/F, Century Square, 1-13 D'Aguilar Street, Central, Hong Kong.<br/>Tel: (852) 2804-6788 Fax: (852) 2804-6997 Email: sales@dreambespoke.com]]></text> - </staticText> - <image scaleImage="RealSize" hAlign="Center" vAlign="Bottom"> - <reportElement x="180" y="0" width="200" height="80" uuid="a03bd52d-7bf5-40cf-ac5a-2b31d62074b8"/> - <graphicElement fill="Solid"/> - <imageExpression><![CDATA["./image/dream_bespoke_icon.png"]]></imageExpression> - </image> - <textField> - <reportElement x="454" y="10" width="100" height="30" uuid="51c583cf-aaa2-4224-ade0-2d68b86a21cc"/> - <textElement textAlignment="Right"> - <font size="12" isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$P{orderNo}]]></textFieldExpression> - </textField> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/webapp/WEB-INF/report/dream_bespoke_icon.png b/src/main/webapp/WEB-INF/report/dream_bespoke_icon.png deleted file mode 100644 index 6a5c612..0000000 Binary files a/src/main/webapp/WEB-INF/report/dream_bespoke_icon.png and /dev/null differ diff --git a/src/main/webapp/WEB-INF/report/dream_bespoke_icon2.png b/src/main/webapp/WEB-INF/report/dream_bespoke_icon2.png deleted file mode 100644 index edc091c..0000000 Binary files a/src/main/webapp/WEB-INF/report/dream_bespoke_icon2.png and /dev/null differ diff --git a/src/main/webapp/WEB-INF/report/invoiceTemp2.jrxml b/src/main/webapp/WEB-INF/report/invoiceTemp2.jrxml deleted file mode 100644 index 7b5119f..0000000 --- a/src/main/webapp/WEB-INF/report/invoiceTemp2.jrxml +++ /dev/null @@ -1,353 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - <band height="121" splitType="Stretch"> - <image scaleImage="RetainShape" hAlign="Center" vAlign="Middle"> - <reportElement x="170" y="0" width="220" height="50" uuid="57915fcd-d22d-4c6a-b920-730f4ed689a3"/> - <imageExpression><![CDATA[$P{imagePath}]]></imageExpression> - </image> - <staticText> - <reportElement x="0" y="50" width="555" height="30" uuid="59fb14e9-3d79-438d-9a66-9a485bbce557"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="18"/> - </textElement> - <text><![CDATA[Dream Bespoke Limited]]></text> - </staticText> - <staticText> - <reportElement x="0" y="80" width="555" height="41" uuid="cfd1a3a8-5645-4073-a9d7-5bd4c150f563"/> - <textElement textAlignment="Center" markup="html"> - <font size="12" isBold="false"/> - </textElement> - <text><![CDATA[Suite 1405, 14/F, Century Square, 1-13 D'Aguilar Street, Central, Hong Kong.<br/>Tel: (852) 2804-6788   Fax: (852) 2804-6997   Email: sales@dreambespoke.com]]></text> - </staticText> - <textField isBlankWhenNull="true"> - <reportElement x="455" y="0" width="100" height="30" uuid="a947f3aa-a8bb-4dec-a012-a1d6572f3173"/> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="12"/> - </textElement> - <textFieldExpression><![CDATA[$P{orderNo}]]></textFieldExpression> - </textField> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/webapp/WEB-INF/root/home.ftl b/src/main/webapp/WEB-INF/root/home.ftl index a2503a3..8e0ed8e 100644 --- a/src/main/webapp/WEB-INF/root/home.ftl +++ b/src/main/webapp/WEB-INF/root/home.ftl @@ -6,7 +6,7 @@ TBMS - + <#--