From b7c579e7c5bc59c3df2842d39eabdfdfa7ebc7c0 Mon Sep 17 00:00:00 2001 From: ComputerFrek Date: Mon, 8 Nov 2021 22:52:25 +0800 Subject: [PATCH 1/4] Created createNewSalesReport --- RRPSS/bin/.gitignore | 44 ++++++++++++++++++++++++ RRPSS/bin/SaleRevenue.class | Bin 1415 -> 1541 bytes RRPSS/src/SaleRevenue.java | 6 ++++ RRPSS/src/SaleRevenueController.java | 49 +++++++++++++++++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 RRPSS/bin/.gitignore create mode 100644 RRPSS/src/SaleRevenueController.java diff --git a/RRPSS/bin/.gitignore b/RRPSS/bin/.gitignore new file mode 100644 index 0000000..07f75cc --- /dev/null +++ b/RRPSS/bin/.gitignore @@ -0,0 +1,44 @@ +/Alacarte.class +/AlacarteController.class +/Category.class +/CategoryController.class +/ClosedOrderController.class +/Customer.class +/Discount.class +/DiscountController.class +/DiscountCoupon.class +/DiscountOrder.class +/Invoice.class +/Membership.class +/MenuItem.class +/MenuItemController.class +/OpenOrderController.class +/Order.class +/OrderController.class +/OrderItems.class +/Person.class +/PromoPackage.class +/PromoPackageController.class +/RRPSS_App.class +/Reservation.class +/SaleRevenue.class +/Staff.class +/StaffController.class +/Table.class +/TableController.class +/Tax.class +/TaxOrder.class +/UpdateOrderController.class +/ViewOrderController.class +/iCalculateDiscount.class +/iClosedOrder.class +/iCouponDiscount.class +/iDiscount.class +/iDiscountCalculator.class +/iMemberDiscount.class +/iOpenOrder.class +/iTaxCalculator.class +/iUpdateOrderController.class +/iViewOrderController.class +/SalesRevenueController.class +/SaleRevenueController.class diff --git a/RRPSS/bin/SaleRevenue.class b/RRPSS/bin/SaleRevenue.class index abf9ec04cfddc14f5542844be61311ac960fea85..3ca31ca825bd7c5162244f4082b7e6f5360a2005 100644 GIT binary patch literal 1541 zcmZ`&ZBNrs7=7+m2HVQU`$R-RMY@6v6;XuDL>H4K3m71Lz)u~!fs)aZQb_inOw`21 z#1H-ef0Xe&x7{e+_NDhF=bY!<^F00g@An@f+M%6cN(jmxSWUSvZ=`cAhe;DOc5dBR zrKaVamiFrB^28T3;>kqADm89Cxh?DQKd0i$Cx^+d18a=%w^*xACD>v0C69 z3(|epx0+!cTtO=BdJXB->?^MDrMAZ>a8oeq zf|5q@C{2Q9bQ+=*@9ya|Oe4IzuTz>bg7P)nk-OIyb?F^i^`^4!o>5@ho4G+zZ({8A+GFI^iDIX{DjdiFone*#-l`w&`DxKhbY0_ z#4f?TR4Y2ER(Mn^ieb%yk*6_y$8l-`uVI}sf6;_F*QRN6wM_+czD=_~6l)IO8E6w! zH7KT`kb~kR%s;@b8SrVI9^wQgdITRr?H0gEsNEu%N!&iBCt>9hRz?k(KWX|aHVNWV z0d-tS>j5B?7W9;sLUI{s7EUS4w?;GSmhBdl!c2hbnoFsWxbQPt4z;323g2T!=K2~j zsMup<1+m4AETG)t03+NbHe%9BA0xBzM3(v*S*7PaM$p7a>w-i~7+D!$gvW%9tPv-{ zLs3F%oz|>>izQO(Yvd)p3dv>knI|%3F1Kktp2!A_ydGeL=ah|X0MRkR=U_%QcN#Dst zO-f9>@Bw@%<61M6!!X>;KFs>p`qsbK-+#aV064;76aj&FP4CE4c`dtr8AV7Sb)jGD z#g5)>7f%`&vS|w}Sn|rW>`GZcR0I_Fc&uMaf#vErzGhoSxBZ@yUP;R^TOV%9`VDF7 z0;+A=dS_UNt|(Q^v|7@t8a=M?rFz0A(ngMqu3?u1f?DoeAoS5}Nd-aNQ;|eUAXzoK z^0*Z8n}0FH+*qlSUCvofGY-h(VzMN;DM^(&{Ws zlJIQGPg0gy`CLUDDn*cTIwGW%S*nuMaoY7=(Q?3V~`hkIRfFc3$pKhngd^uS9m=Xk7tCQX5R~PNFeX#fbgty;Wtj}Z~p@* CIl~J8 diff --git a/RRPSS/src/SaleRevenue.java b/RRPSS/src/SaleRevenue.java index 1687ecc..9d8790a 100644 --- a/RRPSS/src/SaleRevenue.java +++ b/RRPSS/src/SaleRevenue.java @@ -5,6 +5,12 @@ public class SaleRevenue { private double totalRevenue; private Order[] orderList; + public SaleRevenue(int reportid, String reportname, boolean bydayormonth) + { + this.reportID = reportid; + this.reportName = reportname; + this.periodByDay = bydayormonth; + } public int getReportID() { diff --git a/RRPSS/src/SaleRevenueController.java b/RRPSS/src/SaleRevenueController.java new file mode 100644 index 0000000..5de97e2 --- /dev/null +++ b/RRPSS/src/SaleRevenueController.java @@ -0,0 +1,49 @@ +import java.util.Scanner; + +public class SaleRevenueController { + private SaleRevenue sr; + private OrderController oc; + private AlacarteController ac; + private PromoPackageController ppc; + + + public SaleRevenueController(OrderController oc, AlacarteController ac, PromoPackageController ppc) + { + this.oc = oc; + this.ac = ac; + this.ppc = ppc; + + } + + public SaleRevenue createNewSalesReport() + { + Scanner sc = new Scanner(System.in); + + System.out.println("Enter Report ID: "); + int reportid = sc.nextInt(); + + System.out.println("Enter Report Name: "); + String reportname = sc.next(); + + System.out.println("Generate report by day or month?"); + System.out.println("D - Day, M - Month"); + String dayormonth = sc.next(); + + boolean booldayormonth = false; + + if(dayormonth.equalsIgnoreCase("D")) + { + booldayormonth = true; + } else { + booldayormonth = false; + } + + sr = new SaleRevenue(reportid, reportname, booldayormonth); + + sc.close(); + + return sr; + } + + +} From 8470a108ae0267c1b3f4828d47576456595bba1d Mon Sep 17 00:00:00 2001 From: ComputerFrek Date: Mon, 8 Nov 2021 22:52:37 +0800 Subject: [PATCH 2/4] Created createNewSalesReport --- RRPSS/bin/RRPSS_App.class | Bin 7767 -> 7767 bytes RRPSS/src/RRPSS_App.java | 1 + 2 files changed, 1 insertion(+) diff --git a/RRPSS/bin/RRPSS_App.class b/RRPSS/bin/RRPSS_App.class index 1686bfe00694df1ae0d556d09786ce4bf02a6ea2..50c46399d2bb5c762b6b5ef930e717222e062e23 100644 GIT binary patch delta 530 zcmWO3SxA&&6vpxY^EnrlFk+2~(Jh*n%L2O<`mg6}D(%Nm^JP-ire-=jHs~=R||iV13A!us~@nQaXz@ zgCz>GR3S3mEMKp}S;Vq}ajawltC+-UQdz@v)-s12LgcdE&So~SjXVn2$bL3)*lvp0 z!YQ^=#&)X6rS#9IYp(O2n|z|4K9de}TMn)gxuYpo)48izG-y8ew2%i{wvI++^H8}o zDUV0Wr&$HGsF24x!V?wKsuG^6f@iAXxo+@6Ewrh_>Ra0NfesDwQbTk)@XCoL>UeqM z#PQBapxa5}qkG<8toRc`vA57&ZK}#@` rU$(g++t9FW0cke@WpVX%aK-e{&VXJb5C?DYO3rXG@Na delta 530 zcmWO3SxD4T6vy%J@2?N0Fk+2{(FZaN`_i#SvoSr~Wpg!o0U!WAyl*&R) zXORLdR*)s3<=(Ig(}^L2F|1%5E1AG5rm&i6tYHqB1X)K8*=)9RD;vlsm;G$yFqy)2P&mg6+Bcmk93{K>fnjGEWYBI`gyJ)x-`rS2fCdYUOFCn zomgHw@w{;o=?_)5a1o**H re%jW4k;SlWW5lNZ+g+PfllX^N{*uf;Qf$UEB<5O=^AzDGCC~m3 Date: Tue, 9 Nov 2021 23:18:02 +0800 Subject: [PATCH 3/4] Completed GenerateSaleReve by Day --- RRPSS/bin/Order.class | Bin 4663 -> 4769 bytes RRPSS/bin/OrderController.class | Bin 3255 -> 3407 bytes RRPSS/bin/RRPSS_App.class | Bin 7767 -> 8107 bytes RRPSS/bin/SaleRevenue.class | Bin 1541 -> 4398 bytes RRPSS/src/Order.java | 10 ++++ RRPSS/src/OrderController.java | 8 +-- RRPSS/src/RRPSS_App.java | 5 +- RRPSS/src/SaleRevenue.java | 70 ++++++++++++++++++++++++--- RRPSS/src/SaleRevenueController.java | 37 -------------- 9 files changed, 80 insertions(+), 50 deletions(-) diff --git a/RRPSS/bin/Order.class b/RRPSS/bin/Order.class index fa7550e31cfdcf94e305824f9cacf024b34fbc65..e78c3c6a7977c6842dbcf0a7291782a651df6116 100644 GIT binary patch delta 280 zcmdn4vQU-l)W2Q(7#J9A7>;h_ir^68%`EmWN=Yqp&dD!MO<`nU*3gWaoWP-`y@!#3 zJ=#FmQZH7Ui(wzb0d|J{j0^%P&562JSL!op!P8aK5e1h+ZguFL^65uUqLQ| gWnja^AnKro0d+7OVyFk20yUN&$UF=*h>76{0K{%J!~g&Q delta 147 zcmZ3ex?P3q)W2Q(7#J9A7!Ggbir|=B!J#6&i;;mn+CbM*FIJn2VGqMTc80x^*K>$6 z?`POC`8da1MybuIoXs4pObpwB0**prUOTrj?4HTM%Cd%e4bUiN25TV6#=r<9=Ku|6 mU=U+q0+NCZwhVSa8pJxlP!E)^0J51G82N$BgFq$|!yy29gde5= diff --git a/RRPSS/bin/OrderController.class b/RRPSS/bin/OrderController.class index 4fc19c8bf522facb9a440a66ba4ab41a042ee790..de55af2994e0611e4130cce4eecd6a252bae483f 100644 GIT binary patch delta 147 zcmdlkd0vX^)W2Q(7#J9A7`ATYlHpL}Nlz_t%*pXDN=Yp$W@Hf5(DcblEKAfcEy>K$ z_f0IYW@OOS(43g4J6Vk*mXTv~3x^(y*G2{=26mt!ObnYCgn_g^10xVJFtBQEVUXMa fmM{d8Y+%7i1|uMw2cm$%n85_dV`SJ2R<#8H#10%9 delta 36 scmX>vwOx|y)W2Q(7#J9A7&dL>lHr(K$q~!QzWF+b9t$f20~5nW0Pcti#sB~S diff --git a/RRPSS/bin/RRPSS_App.class b/RRPSS/bin/RRPSS_App.class index 50c46399d2bb5c762b6b5ef930e717222e062e23..9eb588d7b9bc5976e5c78a4138315634a2c3efbf 100644 GIT binary patch literal 8107 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 nn#HH3U+C=YNl&b^bFAz^>} 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 KgXHIv_#Xh&0I^&E diff --git a/RRPSS/bin/SaleRevenue.class b/RRPSS/bin/SaleRevenue.class index 3ca31ca825bd7c5162244f4082b7e6f5360a2005..a901bcd8e4b10c3156c8dfb657097de1af0755a4 100644 GIT binary patch literal 4398 zcmb7Hdw&$=6@K2$CbO4GvIK)J*k)D4BtRlyEo=}ANr2TPqyz#+OP%aa!iL?QFgpvT z7h9_KN^P+>u~%DKYDa$4Etf!m-o2*#R1zH|?~Q+OaTXEKp}kL3b?2$P~}v5={jyJ7wA<>Aalq z_{biaQMYAlI+u2~DKvHWOe**Xt&|x;6PD{}M?|50B%L$I3fXDX-e*i_TnJXu$V?h` zTIR(?zjHX9S7;rnx}PAMHJ!cX+wh1)5DKewG^2&P`RZMNcR~=fmQ}nP-`3r;^v+`C zE*%;IR47~V6gsbnL-B3fjCF%H#yl$93#QlxsQj zDThuBU>|jB>6;s+kr#+tni>dTmcAx}0Q3;%kkN3YHo$J((vby^iI_(V zMkb$_%~`fNXyl2aVFFJDFs~5xJSq6Qhx=yxV)t)cKV&9*;;{g1h12rqSIRrDDF|(^XJIeF1Bx}YmRxeDWWlz{SohZSL%GY)-4!#J@&K-IqgZYs z7UoNB#M-Kh(oMH~kreK%k`|xUJW8bIlI^;8Nnt~k2+#Af%AVM_(az8ed zfymqgvavoin;Qao03RtTS2)7ZY^(?J5P@vF2@v7B9Q+_YO8#ti9k4}6+w?a4@>K_~ zBL3I~Y`u&fasLGjcO(|^Xm8ZNh;i~!7A8sy`^gJgILHP0PVp;(`{T_WPsCd~4!w>i z<66gzd;-ztj>C&cpT_cDKf@^U7Uj<((%V#=A1&**h?)GlD>$YQ51qx;Xy^()qi_u; z;=#5p;k8%rjKURsh1+ds@j|q%xP3C-8g0FT=SB2Xygk|;4KCtai}>za$TH+>PUFF7 z`yyV7YK!<$JR;*Wr?EF0iMF`lcHa@M=q%!Fa!dFuHhC(6YL%|CO6O7)fpbpbr5kgC z+Z}C}DEZww@H|rt*g;ARaX!q<-^E1PjXpfWxID_(jc|1g3HHC^{5im$*T6o^U_Wx0 z#8Ivs!$CZaDLjWK*rgo8%XkuJD0K} zVW?3YQU}*au-i(B5 z$7POMFs=f4ouSciKqq;VOR5{{zq975srW4-@G#coTo*zi8Kq;Trx#1n;tB z{F(9*;w+Bv7ozLsS#th){I!hfZ)Hqx5tC=_@3i(0%KsPI4Z10)L1}na!*TaFu3^so zH8gq(`VHPTd@B)+O$TnUp0?dWO2Y}tHSxZ#@FBFnzp#dr6xY}l(R}~^V?Ou+5YsVl V(+NJjgMacXCGaHM;Oi~H{{giY*v|j} literal 1541 zcmZ`&ZBNrs7=7+m2HVQU`$R-RMY@6v6;XuDL>H4K3m71Lz)u~!fs)aZQb_inOw`21 z#1H-ef0Xe&x7{e+_NDhF=bY!<^F00g@An@f+M%6cN(jmxSWUSvZ=`cAhe;DOc5dBR zrKaVamiFrB^28T3;>kqADm89Cxh?DQKd0i$Cx^+d18a=%w^*xACD>v0C69 z3(|epx0+!cTtO=BdJXB->?^MDrMAZ>a8oeq zf|5q@C{2Q9bQ+=*@9ya|Oe4IzuTz>bg7P)nk-OIyb?F^i^`^4!o>5@ho4G+zZ({8A+GFI^iDIX{DjdiFone*#-l`w&`DxKhbY0_ z#4f?TR4Y2ER(Mn^ieb%yk*6_y$8l-`uVI}sf6;_F*QRN6wM_+czD=_~6l)IO8E6w! zH7KT`kb~kR%s;@b8SrVI9^wQgdITRr?H0gEsNEu%N!&iBCt>9hRz?k(KWX|aHVNWV z0d-tS>j5B?7W9;sLUI{s7EUS4w?;GSmhBdl!c2hbnoFsWxbQPt4z;323g2T!=K2~j zsMup<1+m4AETG)t03+NbHe%9BA0xBzM3(v*S*7PaM$p7a>w-i~7+D!$gvW%9tPv-{ zLs3F%oz|>>izQO(Yvd)p3dv>knI|%3F1Kktp2!A_ydGeL=ah|X0MRkR=U_%Q taxList, ArrayList membershipDis closedOC.CloseOrder(order, taxList, membershipDiscount); } - - - + public Map getAllOrders() + { + return this.orderMap; + } - } diff --git a/RRPSS/src/RRPSS_App.java b/RRPSS/src/RRPSS_App.java index d91281a..16f2c30 100644 --- a/RRPSS/src/RRPSS_App.java +++ b/RRPSS/src/RRPSS_App.java @@ -10,7 +10,7 @@ public class RRPSS_App { static CategoryController categoryController; static PromoPackageController promopackagecontroller; static AlacarteController alacartecontroller; - + static SaleRevenue salerevenue; static ArrayList membershipDiscount = new ArrayList(); static ArrayList couponDiscount = new ArrayList(); @@ -24,6 +24,7 @@ public static void main(String[] args) { categoryController = new CategoryController(); alacartecontroller = new AlacarteController(); promopackagecontroller = new PromoPackageController(); + salerevenue = new SaleRevenue(); int choice; Scanner sc = new Scanner(System.in); @@ -68,7 +69,7 @@ public static void main(String[] args) { case 6: break; case 7: - + salerevenue.generateNewSalesReport(orderController.getAllOrders(), alacartecontroller.getAllAlacarteItems(), promopackagecontroller.getAllPromoItems()); break; case 8: System.exit(0); diff --git a/RRPSS/src/SaleRevenue.java b/RRPSS/src/SaleRevenue.java index 9d8790a..ca67bfd 100644 --- a/RRPSS/src/SaleRevenue.java +++ b/RRPSS/src/SaleRevenue.java @@ -1,3 +1,9 @@ +import java.util.List; +import java.util.Map; +import java.util.Scanner; +import java.time.*; +import java.time.format.DateTimeFormatter; + public class SaleRevenue { private int reportID; private String reportName; @@ -5,13 +11,6 @@ public class SaleRevenue { private double totalRevenue; private Order[] orderList; - public SaleRevenue(int reportid, String reportname, boolean bydayormonth) - { - this.reportID = reportid; - this.reportName = reportname; - this.periodByDay = bydayormonth; - } - public int getReportID() { return reportID; @@ -61,4 +60,61 @@ public void setOrderList(Order[] orderList) { this.orderList = orderList; } + + public void generateNewSalesReport(Map orders, List alacarteitem, List pp) + { + Scanner sc = new Scanner(System.in); + + System.out.println("Enter Report ID: "); + this.reportID = sc.nextInt(); + + System.out.println("Enter Report Name: "); + this.reportName = sc.next(); + + System.out.println("Generate report by day or month?"); + System.out.println("D - Day, M - Month"); + String dayormonth = sc.next(); + + String inputdate = ""; + DateTimeFormatter bydaydtf = DateTimeFormatter.ofPattern("dd-MMM"); + DateTimeFormatter bymondtf = DateTimeFormatter.ofPattern("MMM"); + + if(dayormonth.equalsIgnoreCase("D")) + { + this.periodByDay = true; + System.out.println("Enter Date(E.g. 02-Dec): "); + } else { + this.periodByDay = false; + System.out.println("Enter Month(E.g. Dec): "); + } + inputdate = sc.next(); + + sc.close(); + + for(Alacarte al: alacarteitem) + { + double itemrevenue = 0; + for(Map.Entry e : orders.entrySet()) + { + Order currentorder = e.getValue(); + + if(currentorder.getOrderItem(al.getItemName()) != null) { + if(periodByDay == true) + { + String orderenddate = currentorder.getEndTimeStamp().format(bydaydtf); + if(currentorder.isOrderClosed() == true && orderenddate.equalsIgnoreCase(inputdate)) + { + itemrevenue += currentorder.getOrderItem(al.getItemName()).getSubTotal(); + } + } else { + String orderenddate = currentorder.getEndTimeStamp().format(bymondtf); + if(currentorder.isOrderClosed() == true && orderenddate.equalsIgnoreCase(inputdate)) + { + itemrevenue += currentorder.getOrderItem(al.getItemName()).getSubTotal(); + } + } + } + } + } + } } diff --git a/RRPSS/src/SaleRevenueController.java b/RRPSS/src/SaleRevenueController.java index 5de97e2..b741447 100644 --- a/RRPSS/src/SaleRevenueController.java +++ b/RRPSS/src/SaleRevenueController.java @@ -7,43 +7,6 @@ public class SaleRevenueController { private PromoPackageController ppc; - public SaleRevenueController(OrderController oc, AlacarteController ac, PromoPackageController ppc) - { - this.oc = oc; - this.ac = ac; - this.ppc = ppc; - - } - - public SaleRevenue createNewSalesReport() - { - Scanner sc = new Scanner(System.in); - - System.out.println("Enter Report ID: "); - int reportid = sc.nextInt(); - - System.out.println("Enter Report Name: "); - String reportname = sc.next(); - - System.out.println("Generate report by day or month?"); - System.out.println("D - Day, M - Month"); - String dayormonth = sc.next(); - - boolean booldayormonth = false; - - if(dayormonth.equalsIgnoreCase("D")) - { - booldayormonth = true; - } else { - booldayormonth = false; - } - - sr = new SaleRevenue(reportid, reportname, booldayormonth); - - sc.close(); - - return sr; - } } From 7b6d1a567b0b6461cc511e5145b118ea22e17516 Mon Sep 17 00:00:00 2001 From: ComputerFrek Date: Wed, 10 Nov 2021 00:16:19 +0800 Subject: [PATCH 4/4] Complete SaleRev Report --- RRPSS/bin/ClosedOrderController.class | Bin 5883 -> 5940 bytes RRPSS/bin/Order.class | Bin 4769 -> 4769 bytes RRPSS/bin/RRPSS_App.class | Bin 8107 -> 8126 bytes RRPSS/bin/SaleRevenue.class | Bin 4398 -> 5781 bytes RRPSS/src/ClosedOrderController.java | 2 +- RRPSS/src/Order.java | 4 +- RRPSS/src/RRPSS_App.java | 7 ++- RRPSS/src/SaleRevenue.java | 85 ++++++++++++++++++-------- 8 files changed, 68 insertions(+), 30 deletions(-) diff --git a/RRPSS/bin/ClosedOrderController.class b/RRPSS/bin/ClosedOrderController.class index 0e2a2892ce6a38abc496509e37c46af659bbfc02..51bec55d4188c1925681a403856a1f8dff46603d 100644 GIT binary patch delta 1523 zcmYjRX-r&I7(E~JhBwO_V3-+T%1{T8vJ68*Ye^kyYYWs87Eu}u5VZ(TpwbySi>amw z@t@H@O>WYr=?@cQikc`=@lnB6Tr0IzabMfI*1hf1<`HUn);H4mw7s3@zJZ|lx36uB*9VJAM1`J!tooU zJ$lrJX*gteTEiQ7Qv|I3tQowc;%$Ou@uY@#@t)|i=53kA2O2&^DKm`e@x^#cw7*-o zArBu*kWUDiC5?-*WR~jEHksoy4QIrZb%?$d*V}T}eNRZQEcG|(yYA4VvA+Jnkl%tI z3HCLm{+dW)FcOvo zg+;5#vNQjhzDOjdFViK5Xw*8}GFhPJNQK{8tH-*d{e$uTNLVE|A#G8Y`2sDJ#pV_D z@X4Z>jdEy(N?w9OJ(MpZ3!YE_)vIWcdHatf8 z8Wm9C({+xsChHIs76#Zaf=>UCfw6-yr;U^uI2trCS(WNZeVn8GE9b@{B86KHw}P^A z1II(kFuZd1qMW54!NZxa7pwd z#}`|^hb0!5lhuszTC%7xZ5&2Hd7go~DT2&3Mk#^A(B`)=Bf8!7G$)>L=b02Ti_`8R z2Y+Lh&@PC}?t+HYVKgvx7un{SO;#x$vA{o!>A& z;6=WaAu6+6K_@dXT{nzCz?UrC)tqGSF&~4e-Q+t;*{$tL(4f3lgZyH5*0$nBMr)Z# c2cu=fM^{r3tG#@oHc^^5m*rMhNw=x^e|wg4$p8QV delta 1539 zcmYjRTTok76kR*H$xUutuGAMLWd>@q0{OI zGSYjxiZ0S$-CgK_n;FyjlaVE`D0a3Cs`zbzOb2p}wx9QI{C%PsB4o4m>N!SsQ+y;LgNa z2D*&_4JYB2uNQTk#!KQRXLxuPuc~;3;K=OM@fuzy zC?(_!8cXz9OU%$vfOjPLy9Cdwt(nwR^{Ubinftzu53r7NcgkFG!8ug$B_VH{(PzYx z;Y>!jeP6#34Lk6)xKHzWz9qQUmWCH~%JBDMQmavaB*1~6#hjLJ|5e9t_+5ltt@NkZ z?OIuIj#1l;B;$mejNLaI1A{%i{SEcCGW{Ph=IRLGUxK#0=EOWM=r}J{=s~+xCxvXH zMz6?I3E6c$iNv6>On{u?4t+;Q7VBtERD_-N#$arqH`PIvatK)&A&Zn9(ZEL&}2DyobkD8G)&uWX6-45Rt*+|g;A?3~1@s2Ws*ikXiWC4e z-iQQM6K~7cd*WPf(Qq-MC_yz!aV08Ii!HbsE!c=Q)T0xda2>8eH%EKWh+DB0d(niu z(2RS~ifrc7wx|v{$mJR9#0FfEV!WSGtC+V7cjH5R1S_&|CqBj}>_`ZEa0d6nHq1q1 z_!Qe=XZS*VhR>lg1wdZ{sbi2EIO2zG0VOI9sF+nTG>;;3I$gZTmyyUDs)!jke%7uc;3F;wIuRl9)d+ z2HSt6xvZSM{Uxddl~apV|43K)E4{<>w>ae87myCff}3%kbz9l3I_ZU2=UeHWy_}de z--aa?b0Y2w`Y|tYC$JD1fxf!H#HJIN6%YCv3MGcrS&{bGf->&bcE-&HpIjng_m{Z& zud{@BR&4MWHCjf|$n?ErUt~AAUhyjrKxYl@e&rB~q_(sIFFBSZjKDsMTzV|xSCsBF zk4OBw)@a;e>HLmVhb?e33)x{SpN9@|F(c)F&Af#)aaEqLW0pc8UL<*AGXzObHE@d0 zfx^OSQ!L#~z*;kkNF*eSQg(AHoNJqbwbL3pM&50mO1VkFZ6<}p;k+#yGlVWn*59lKm!8_1s8-Bg;jAOHEmVQd{m}i zmRjSesasG!Ko=54^O2Lvl$K*g&fwHoLs^-cQ)=7!K0ZSIE%&Ucno8Igy4(IUi9ftW3f@F~PJEvAZZ38CsD z6pIZ)9NEOLgpp~b1kGeyNoAPj)aG!MRZEY~ zGGaC=#jEP*SUVh2&>TW&e5UMNF~^$Wm|Nq_bykU{c8P`YyIgBhfW8?=LTx!7sME|iPy z+VNtt&T3Z8=f4DW=kTz5v2G&m5%=mE$lg?_pQ@(frWWH#A1W1>1dMexBF8kvgBK+| zopmcB3z`v~ff*?Vd-i#T!D+CG>EN$DpUBVDPuopCCixtBwieBo$aDFkU0hLIGBQ51vGGyr2L0nbtr(#eW(l#C3@#CV$M zLMG)Ri}Em$ijYGkOt%F2e_Ad;DL%wUyzAs->e0XzDIyI%Mj%w2su!PN57bPp2<+uk zfz!Q$ee!Ap&SO8PszDRS8~=|yz>x>pG8}!p{8Nof3lFr2)S{Wo?SBtJTG+i<1|L2k z<$z6qMx#@yR1s{~;|+xKjS+zAWqv`=nTGe$B2!{TivsQ;MITmlo1%{?T3i)8EIh|_ ziaC(z!Rah1_N=nW=8f199G;kC`dTq{Q|@BV&PQ^;)U(q{{;?s^lp~G_2@aIF6t=|+ zH;nSNKk$>{?2s5&K76_90x*?-F--p0- zf2*(#4s66+Y{NW!fcac)Cs(=#pQ08=@e)pB0os{B7dff}i_wK8xDFR?V<}g78L0=O zjszYA2CSyOSVR6;OD4R|d|4+$Uk(E&ab5--@FhP9NO4qXNfe{t#T2L*7hdX8?jj?I zEk?$aEn-_})Zm`pltH+m6#1s2Z!7waq7@KCKlAYX9Me6v_F&M8e+vSLIiX7Okl-Pm z62Z{OJ`yzDKECW@dB~?-@ktdVJhqtw1Eg6KKz-ypCU~fyWIt`rEbTQWSAzY+#dorKDeEwnIke^-eJDH%Y50yeAz4ygh6k+!kI8#UUDv zR?5O*nuIngz)>p3F`9|b$bsWjixadMCus#v(HeYCBEF!_I72&dmiFKrHKU!*;Y<3S z^)+0e-|>wKxTsR&lFAp~s)BJ@Wk!c844tYNTvf&4Cz*HRt#FfCqMANpU+5!L^YTZ0 zCEAJSBVvs5p%eXN!~KW>WEbNi^ZdKe7r*dS_>~9gbsm_%iEAS#>;K?d-rza@r}%SZ zee5lsUAMWme_;gf;CcLw0{p{Wcb7Zu9;$I)Y>L`t_VV386cH?>MhdsfNS=G?h(pV{KtU*0z zwEEMct)U*P(P|!S5JEkw_2^8BYQ+qusx3v0>WkW*d)-C4Gv}T?=Rf!V&wsw}oZFhc zGrPV{mu*BLq3hI=+LEMMuF9&U!bv4gXL(HkMq;!PqXbsRnXdBb7L0*| zAXPdEVIoK$W;UY$<1FZo@xr3FnU!}ZSTGUA;-oH?O2tiGmZ1!jjVKp(IYKuD6=H}S zCr>53C|;A(Z3B#`BIrkylvb6SF%3>-uNee6KBuXtK9N$&u*ibNsNkULno6fjIdF*u zOR{Sf+6GP|fy%|(A%op5C~!1lL^H+?YeZ3Si5HU;UCFuy(T-+x z%L_6e#I#IVm!|h1+$x9ZTQJQLrk9JGF}-lHp2GB2xplMeXE{x;yjrboQKM;>rfW4l zThntD?dBKeX^#1tUf{*TL@(aV;@!MhZmWa(tL7)Mm{^io(pa)s2C)ob$z{o7soaZ| z9t_%xRUTwFBE^f<9;A7Y>Oryx_C^d>oogB~*bDJZXt<#$csn00ZignjV~~$nI2e`^ z^gt!zP>r6bMK3I2y&BJB4HEDH`d}*(@d@nMjlMX5Bpl$Gc~p#iDr5Y6tM@bV z<;$@HAG39pDN=`>T#bARf{$gAL=E5k-vr1V(ovUP3VjqLkaP98)nF(@}w0T-Ld4E#%%_ ziYmOt-nE#4O$^Ew)Gz=u84wrtapWPc_X)g?GnkF@n1gn_fg6~ITbR!Py1DiXNY@Vw zNybt#^8o0K<($ZvqtS32)45XorKuMQb;)Bhv1EdX~Z}Yk<|PoR`>Q8P|c&S`v2 zm-x?hw9y@$m4I`S4&O?FxFCh&JIRWRQY0=*vA80|@jaD^wGLf)$o=SNCa){ZjEbs{ z_#ZQUe4{{xrQ%vttVLaPp^NGWita@PB0YLk*I&??uNZ}!Jdl6o!Fx+=j2;nihb#LV ze-G}82hnxi@A35eohyBxzY2fw82^jM_}@In|KX;5z|Hqid=azF`iS%LA%@$_P7?Z) Pjz_YLL8KRpyJh|dYsM&Q diff --git a/RRPSS/bin/SaleRevenue.class b/RRPSS/bin/SaleRevenue.class index a901bcd8e4b10c3156c8dfb657097de1af0755a4..128cd1a63af4b6ed94447c88f080c33810e6dddd 100644 GIT binary patch literal 5781 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 BYDEA5 delta 1918 zcmb7E>vt1X5dYmI&2Dx#O$Z{af<%GZ7D^R899UigDKyZOLP`sWl_go)gk)2aZJ{az z1bje6%8F8aqG&|{<dkW(0L;XXCxkkOV@j!+am-;!^O|Rh`I}=}p2G}=VM(=Jt!y(Asmf?f)pafF z!7R+-Fq^?|+fu6DTp8`i8CqJx6PU~3NazeBYHVvFQyJD<+l;7@)ztJ10Se|z@FB!7 zs`MWrWerw_1(FL3QEk>ZgDV#ijVj&HvcY9qYbI+1!yzRopa!)ZA`HU^6V+uC`mIC~ zmS7wM*J`O!x|MdRgk_LPr)!&xux{|EH-C1H3Mgoh(1@`NF3ZAWrRjD}c;rcjKqy!d z45=NHf)NrT8Qo~%@e~7iJk8*a$15U{hyWEa4r|Ra;bCVSni&b8>s3wsk)H8V2RNN)O&7dvZLS+mA!qi07$Yia8x0+ksa@q3?{M?ipQ?mxe z+<_N3>}2o`xkS`f2`}O$^O*2pewUSV_Z{}AW^j0Aa2M=@LN4Q}kZgyDPP{5%FSb&a zX3c0&Q*9cDeN@DfY+TC<*oN06?6;aPlAY+KYt^(SpbKwEIDl>jiS#y@jApf1!gt|K z32)(TbFVnX{Voo1c+b2nj&{C}56oZ11@&F{P{K!;Kr9nE+jG9vu(*Ja@d<|`48mZ% zbWXyjm^hF;+P1bnW2h++n{iCSaVrAXqULJpP?$+RWG?0JH;?nO*(}W(<4{u+r)IEo zbWy|vk( zQWRLNxC2dRu}0wn>#T*BivleLB)T!Y+|`Q`3!fo;5B%j$`p;X64YvchtvIw1I3V28HTk_#u0Qiw+ z!=baW$goGTfz5}?B4}cbbdyIQ4?6BXYyWXCMiM(q`V60g#tlg)a1st%Iz^Hb605;! z^in-l6tqASsR&`_!x@s?sAD|N((Z6*WDMs>;)&i-oW~dN5XmF>l4=);>ULbfSMcI` zo>*MO*F@n4#^W1u@DtNp622uq<&!(I}I4}-7 zIBc|Eg+tPQRgQWEsh`Rf2|}alUoafqNA%+X6yGHhhi!y&QpGm73BLaZbLb>EN3({) iudn<+@jW)@yHlptT%k5Na23~R6{u;QG+?j0J%0iOf5QI& diff --git a/RRPSS/src/ClosedOrderController.java b/RRPSS/src/ClosedOrderController.java index d3191b5..8d8e588 100644 --- a/RRPSS/src/ClosedOrderController.java +++ b/RRPSS/src/ClosedOrderController.java @@ -54,7 +54,7 @@ public double CalculateDiscount(Order order, ArrayList membershipDisco System.out.println("Apply Discount?(Y/N): "); String isApply = sc.nextLine(); - if(isApply == "N") + if(isApply.equalsIgnoreCase("N")) return 0; PrintDiscountOption(); diff --git a/RRPSS/src/Order.java b/RRPSS/src/Order.java index aab2dea..9524ffc 100644 --- a/RRPSS/src/Order.java +++ b/RRPSS/src/Order.java @@ -156,9 +156,9 @@ public boolean isOrderClosed() { if(endTimeStamp == null) { - return true; - } else { return false; + } else { + return true; } } diff --git a/RRPSS/src/RRPSS_App.java b/RRPSS/src/RRPSS_App.java index 16f2c30..69da833 100644 --- a/RRPSS/src/RRPSS_App.java +++ b/RRPSS/src/RRPSS_App.java @@ -27,7 +27,7 @@ public static void main(String[] args) { salerevenue = new SaleRevenue(); int choice; - Scanner sc = new Scanner(System.in); + System.out.println("Restaurant Reservation and Point of Sale System (RRPSS)"); System.out.println("========================================================"); @@ -37,6 +37,7 @@ public static void main(String[] args) { for(int i = 0; i < tables.length; i++) tables[i] = new Table(i+1); int ordernum = 1; + Scanner sc = new Scanner(System.in); do{ System.out.println("(1) View/Create/Update/Remove Menu Item"); @@ -50,7 +51,7 @@ public static void main(String[] args) { System.out.print("Enter Choice: "); choice = sc.nextInt(); System.out.println(); - + switch(choice) { case 1: @@ -69,7 +70,7 @@ public static void main(String[] args) { case 6: break; case 7: - salerevenue.generateNewSalesReport(orderController.getAllOrders(), alacartecontroller.getAllAlacarteItems(), promopackagecontroller.getAllPromoItems()); + salerevenue.generateNewSalesReport(sc, orderController.getAllOrders(), alacartecontroller.getAllAlacarteItems(), promopackagecontroller.getAllPromoItems()); break; case 8: System.exit(0); diff --git a/RRPSS/src/SaleRevenue.java b/RRPSS/src/SaleRevenue.java index ca67bfd..b091c47 100644 --- a/RRPSS/src/SaleRevenue.java +++ b/RRPSS/src/SaleRevenue.java @@ -61,10 +61,8 @@ public void setOrderList(Order[] orderList) this.orderList = orderList; } - public void generateNewSalesReport(Map orders, List alacarteitem, List pp) + public void generateNewSalesReport(Scanner sc, Map orders, List alacarteitem, List pp) { - Scanner sc = new Scanner(System.in); - System.out.println("Enter Report ID: "); this.reportID = sc.nextInt(); @@ -76,8 +74,6 @@ public void generateNewSalesReport(Map orders, List al String dayormonth = sc.next(); String inputdate = ""; - DateTimeFormatter bydaydtf = DateTimeFormatter.ofPattern("dd-MMM"); - DateTimeFormatter bymondtf = DateTimeFormatter.ofPattern("MMM"); if(dayormonth.equalsIgnoreCase("D")) { @@ -89,32 +85,73 @@ public void generateNewSalesReport(Map orders, List al } inputdate = sc.next(); - sc.close(); + double totalrevenue = 0; + System.out.println("====================================="); + System.out.printf("Report ID: %d\n", this.reportID); + System.out.printf("Report Name: %s\n", this.reportName); + System.out.printf("Report Date: %s\n", inputdate); + System.out.println("====================================="); + + System.out.println("Alacarte Name\t\tRevenue($)"); + System.out.println("-------------------------------------"); + double alrev = 0; for(Alacarte al: alacarteitem) { - double itemrevenue = 0; - for(Map.Entry e : orders.entrySet()) + double itemrev = getItemRevenue(orders, inputdate, al); + totalrevenue += itemrev; + alrev += itemrev; + System.out.printf("%-16s\t%.2f\n",al.getItemName(),itemrev); + } + + System.out.println("-------------------------------------"); + System.out.println("Alacarte Total: " + alrev); + System.out.println("====================================="); + System.out.println("Promo Name\t\tRevenue($)"); + System.out.println("-------------------------------------"); + double promorev = 0; + for(PromoPackage promo: pp) + { + double itemrev = getItemRevenue(orders, inputdate, promo); + totalrevenue += itemrev; + promorev += itemrev; + System.out.printf("%-16s\t%.2f\n",promo.getItemName(),itemrev); + } + System.out.println("-------------------------------------"); + System.out.println("Promo Total: " + promorev); + System.out.println("====================================="); + + System.out.println("Total Revenue: " + totalrevenue); + System.out.println(); + } + + private double getItemRevenue(Map orders, String inputdate, MenuItem mi) + { + DateTimeFormatter bydaydtf = DateTimeFormatter.ofPattern("dd-MMM"); + DateTimeFormatter bymondtf = DateTimeFormatter.ofPattern("MMM"); + double itemrevenue = 0; + String orderenddate = ""; + + for(Map.Entry e : orders.entrySet()) + { + Order currentorder = e.getValue(); + + if(currentorder.getOrderItem(mi.getItemName()) != null && currentorder.isOrderClosed() == true) { - Order currentorder = e.getValue(); + if(this.periodByDay == true) + { + orderenddate = currentorder.getEndTimeStamp().format(bydaydtf); + } else { + orderenddate = currentorder.getEndTimeStamp().format(bymondtf); + } - if(currentorder.getOrderItem(al.getItemName()) != null) { - if(periodByDay == true) - { - String orderenddate = currentorder.getEndTimeStamp().format(bydaydtf); - if(currentorder.isOrderClosed() == true && orderenddate.equalsIgnoreCase(inputdate)) - { - itemrevenue += currentorder.getOrderItem(al.getItemName()).getSubTotal(); - } - } else { - String orderenddate = currentorder.getEndTimeStamp().format(bymondtf); - if(currentorder.isOrderClosed() == true && orderenddate.equalsIgnoreCase(inputdate)) - { - itemrevenue += currentorder.getOrderItem(al.getItemName()).getSubTotal(); - } - } + if(currentorder.isOrderClosed() == true && orderenddate.equalsIgnoreCase(inputdate)) + { + itemrevenue += currentorder.getOrderItem(mi.getItemName()).getSubTotal(); } } } + + return itemrevenue; } }