From 04c511a5ad5e6a559124a0dcd5e191bf2b71fc0f Mon Sep 17 00:00:00 2001
From: blsonalib <blsonalib@gmail.com>
Date: Tue, 17 Dec 2019 10:15:57 +0530
Subject: [PATCH] Added cabServices for normal and premium

---
 .../executionHistory/executionHistory.bin     | Bin 124890 -> 124890 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/5.2.1/fileHashes/fileHashes.bin       | Bin 19797 -> 20897 bytes
 .gradle/5.2.1/fileHashes/fileHashes.lock      | Bin 17 -> 17 bytes
 .../5.2.1/fileHashes/resourceHashesCache.bin  | Bin 19041 -> 19143 bytes
 .gradle/5.2.1/javaCompile/classAnalysis.bin   | Bin 21955 -> 22398 bytes
 .gradle/5.2.1/javaCompile/jarAnalysis.bin     | Bin 20130 -> 20756 bytes
 .gradle/5.2.1/javaCompile/javaCompile.lock    | Bin 17 -> 17 bytes
 .gradle/5.2.1/javaCompile/taskHistory.bin     | Bin 19110 -> 19110 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .gradle/buildOutputCleanup/outputFiles.bin    | Bin 19001 -> 19343 bytes
 .idea/gradle.xml                              |   1 +
 .idea/workspace.xml                           |   9 ++-
 .../CabSubscriptionsType.class                | Bin 0 -> 1091 bytes
 .../cabinvoicegenerator/InVoiceService.class  | Bin 1775 -> 2305 bytes
 .../cabinvoicegenerator/InvoiceSummary.class  | Bin 851 -> 1297 bytes
 .../InvoiceServiceTest.class                  | Bin 2396 -> 3608 bytes
 ...abinvoicegenerator.InvoiceServiceTest.html |  47 +++++++++--
 build/reports/tests/test/index.html           |  14 ++--
 .../packages/com.cabinvoicegenerator.html     |  10 +--
 ...cabinvoicegenerator.InvoiceServiceTest.xml |  18 +++--
 build/test-results/test/binary/output.bin     |   2 +
 build/test-results/test/binary/output.bin.idx | Bin 1 -> 69 bytes
 build/test-results/test/binary/results.bin    | Bin 516 -> 1086 bytes
 .../CabSubscriptionsType.java                 |   5 ++
 .../cabinvoicegenerator/InVoiceService.java   |  30 ++++---
 .../cabinvoicegenerator/InvoiceSummary.java   |   9 +++
 .../InvoiceServiceTest.java                   |  76 +++++++++++++-----
 28 files changed, 165 insertions(+), 56 deletions(-)
 create mode 100644 build/classes/java/main/com/cabinvoicegenerator/CabSubscriptionsType.class
 create mode 100644 src/main/java/com/cabinvoicegenerator/CabSubscriptionsType.java

diff --git a/.gradle/5.2.1/executionHistory/executionHistory.bin b/.gradle/5.2.1/executionHistory/executionHistory.bin
index 53ac97bd899696e5a16b5c8607d9fa9f2d724149..ab46769075f05b93f4bcd3903e06732acc4e8aaf 100644
GIT binary patch
delta 5753
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

delta 1404
zcmcJOeN2;A6vjENtiVWl+wvK3!kk7O0@4Q9aG?kSGfsgP2~i5A6bplXQ=!OKB+5c&
z5Rc|HVS_S;bA<9?jRlhyn3!eD_)J&~sA(fO87MH>Kx5bn4%}+C{k8kgy}9Syd(VBI
z-x(jGjStZ}Y{z$Soty}6okk;5l;($X!nG2uMyAaz5S@rD%`46;5jwpXTk)`Dzwwa7
zi%NOz36A9CVb5nSKB7XQN<}4DMYh=$!-}V0Xq_nKz~}(#3qvqLr19t#{S<HABi$Sn
z^f;jF7N1n~Lnv8|P>7R79D7DKIUf$2klRcctE6(kl)ea(D+VTGBF~$Caqenrm9mZD
zE**%zi51n6CcQHx0ro30a3+<FJt|i!P<m0pTU+B<r5nn5oYj3CQij0nMr26oOE!do
zr*DB!Bcu`*nfLDKYTXz5)~|R+A6GqxOW24ke4Z6$KkG&;TCQZZ3S74+Iz<aJ9`Zmm
z^ZBGc*IuXid=z#JGjPEiVV}K7c^j;5c#)N%AjF5lxEE>MV&97mpk;D?=s&c3Z$itb
zKDO>3%a;wXL{?;hV6~JSqW+DkNAXslrVISrV`-E88(1MGoz-HM8j#4y!HnY{QHT#r
zwIuvZLCYtFMqL^D@1##TInk%;A|xehj#jHK(&lQlAF@k|*$S0hT*6VWyCv9g3%xTl
zfQFF07h5y0!9x@Zj@hlF2lCEr>b0Knr(BD_yCd-E{)2Gged!TdzDUdyD>e2B=LB*h
zrq19#aOs%KZAogJOU&4Ilx5Z8qTtB7ZLcH0KG=TwdqLlBK4JN_eR!B%Q{Rv#4LwDv
z$+iC_Un*4R%cSx7O4_Qom|Vy(Ue0a=*g(kdPlV=8r!`Ser<(`w{!T4uf0Xhv17k&H
z%(wK<40o28-PZK6w64<SinXv1<xR|0oXXLXTktoWaPUhOJRxhtL1d?kf!EWM2uG%j
z72=aXq5pzGaz93KO}i&EGxnW@(d!ALI~V6SfSaUNCbpOoTOiVX+n(+J*(jj6`rA1$
zvAdv>X0#5S1;UX6GNupM*fEk6;D|u=nig`QT0(nCik~O-l`Ei=jLn8H`;T)--Fa~S
zYcDzqx!#L}qlETAz`B6?SHv@!Z$T!I*&Ik>IM%tQ4LQ#N@jv(JB$c#1u=lyH>@ed7
z{XuYl{hOyx);vplyZ+qeD`@*Zz}P$f4G?Y?Yo93n^PEoBzSwEjy*?utmMO%prUQc$
z<>qbv)B6(cPw?2L5d)YhglfS<7dG3Q?0Rs}xa?}XLpFX4-GnrxbqhP1YrZ+t)Asdu
zyWEUn_umDgX{qX-HcS_Ds(EWta2!9-6sQK5wVL`(bBQqgzdVhxD=d>P8GQfk{ilBb
Da;0b4

diff --git a/.gradle/5.2.1/executionHistory/executionHistory.lock b/.gradle/5.2.1/executionHistory/executionHistory.lock
index bee429fb771492cd35322a69e0c42e7af61cdaf7..1fe636bb280582c4b6d5b89dddd2357ed5206149 100644
GIT binary patch
literal 17
TcmZP;w5{*+H{lmyfPmQm8sq|?

literal 17
TcmZP;w5{*+H{lmyfPg6g8r=e!

diff --git a/.gradle/5.2.1/fileHashes/fileHashes.bin b/.gradle/5.2.1/fileHashes/fileHashes.bin
index 70efaae64edfadf77711454bd1082c4c4154762d..de756deb5fe644bdd9ae123bbfc6046ec14a6ad1 100644
GIT binary patch
delta 1300
zcmcaQi*ey%#tkMCk_NMUChJ==tFC7N13%gSP%zn4!oXpruHC*%uBR76B>g>Ml50O5
zT<j|{{R2ciKoBOrP4d^uYs(n?pz5n9$4Xde9N=_aFz@-T2B_lYFvX`^%AefxKKdIX
z9%wtcS3*JH?wPaUg5475A%cFJCoh!<i1=>*-0aJd)L&3Rf0zlsBm^ZSE+0#Si2Lq@
zi8FG^^8MN)qYhR76eiAea{Up(1KO+*@xc7aZzTc*WQvb`&)ieO4iOA+o@^?qpdr8Q
z<DvpLx9t!?e{q-zN|LHv-$UH{q2l)^`${SZm~CBsv&3qxHbl_(_2g8bpf{^kr*&vj
zA=KE?$+eOV0-68zN`1X{AOos>?c}eL76OHe{db-)Xh8$huW_=fl!8Ff;#&nz{4M&R
z+HX#_m9h{hZTAn$v{ZW!wJ3CQu9SjC#r!|PSyP;~AcBG1FsD{^ET7Y*=Iahs+&;Ng
zN{fkQ;zq?E;u{S*gf}~Sh_EIY17$UVSP_H;#LW8_e#ppK7kSHd%HAON5(Wmwd?DeQ
zLl7evqJgv?stz{e$G4^(U3bVX&GmF}ZOe184(VU7Av)NuPd@1FGWo2JkwRbQZqtva
z)vk3c>3pi4#wiL?$j?9b4n!e~)a1|JYAixJX2z3ceWdE`9OTbczb_MQcY5V%eQ`H1
zi2xm<W9AG|%_@lLkQXl*x86``U70kaqPAM-X*X1dFw}gIPBf>x|KL04A{cn;P4)4m
z{X1W%LUqUkRe}--C*x#!U$uIWlOSfWg2D;SjOWp6C!U#SWg5-QJ90)&24bu9uiX$G
zd<!sj%vWukm3B>f<*t_p1)F~cmqBd>>I4Bk2_S)NM?ElBd}80}DhJKwWVL%_7`U!@
zDnyG#Iamh+gDaXAppF?ar?XWZKQambQS!9N@UKAA(T1sGYw!Oj41a>3w}fi%U^pnZ
z0;a<XVhM{Krk00!T`n_a{<2=E*i#+QuNV%~0@1;lI(e!WC`K)sC-3)?Qb>q0%I*6j
z`1ViN43p&(CO1M=H$zl&uuc96Q?2Z+R|3)owK*Tt<}wi#F)7W@uALfI!r@`-fMEto
i9WWid-k3VdMYCJY4;4NN-Mg{pR&mlRRJXE$gAf3*BYj^0

delta 83
zcmZ3unDOc?#tkMCj8c<*B@8AX1!7f6iOHdo9+Uq9ajcZY<fTA-6^L1-D<)5sHkf=@
jT4FM<jKSnk8HverWt5nh8aFEb5Z`DpLv*vFhX^YGuu~h}

diff --git a/.gradle/5.2.1/fileHashes/fileHashes.lock b/.gradle/5.2.1/fileHashes/fileHashes.lock
index 27edf22b225c14909a65ba66d60a8a2c1a21e30b..9388d5c1957e2631fffa5d5e58152c07b50e58b9 100644
GIT binary patch
literal 17
VcmZRs2+M!|?$oEr3}C=G82~}01^EB~

literal 17
VcmZRs2+M!|?$oEr3}C=m1^_{b1>67t

diff --git a/.gradle/5.2.1/fileHashes/resourceHashesCache.bin b/.gradle/5.2.1/fileHashes/resourceHashesCache.bin
index 0db79bdedd205d4408f482f26b07e469be4cf1a2..bce298e51646b45467b4fae49a0e27765310302d 100644
GIT binary patch
delta 215
zcmaDjh4J`Q#tkMCn!;_1!(aGn%BC@ZftUS%D3}=eV6RBd^aQB*(#ft876S8C-OQP`
zJh%%LOq^UQF++fL=5y0G3vcj21)C?cO73R7xl!?l_(lT<vCWPi3QTFnKuJj;76f5|
z+c|6t&lx1noBUCyMqY&d5>QYMRYjrezO-#6OsdDqk}5Y;Fwe$RF}-D4K&HV`c1Gj9
M=d_$3{{pE10O+7UqyPW_

delta 54
zcmX>;mGR*e#tkMCf&y)e!(aGn%BC@ZftUT{SP6^CYb7R34wc-@IB}!m5Alr#9b%gu
HJrtM#_81Ze

diff --git a/.gradle/5.2.1/javaCompile/classAnalysis.bin b/.gradle/5.2.1/javaCompile/classAnalysis.bin
index 99e9403cdfd3eadd76adce86590c932b16e01cab..d91bf505fa6ed83b4122a0875f59c68ff625aac9 100644
GIT binary patch
delta 237
zcmX@Sn(^N{#tkMCj53o=B~}RRTJyW_QQmxi1~3R~ntW9vK;VNAziv^P&o+o)=;6(>
zl8%i0PK&)1TI`acDmf;HN;xxb+^G0Ne4{~z=w?TcCf>=v{5-h|feJD~c<p3CZwV>q
z#H8TTq~heF%z~24{Ji3j%7Rpo5sd3W()!q>qhmn|prFhc$oLGzuR(ZnV6ZwHNQM<`
Sx(GJyKsAz+^#f}de*ggTHAlDr

delta 43
zcmV+`0M!5ft^vcV0kAX}0U47u7^su=7)Y~K894!yrW!f{X|W;r7qKv~6|+G|f(>*<
B5Jvz2

diff --git a/.gradle/5.2.1/javaCompile/jarAnalysis.bin b/.gradle/5.2.1/javaCompile/jarAnalysis.bin
index abdbff34b76b5987f59adb7b9dc08f928c0bc29e..e6cc02770e28f7127675165b4a477f27c9bb2cd3 100644
GIT binary patch
delta 333
zcmZ29mvPD>#tkMCjO>$5B@6@(+9pb`GM~uJ00w@GCdWz?Gw$4|_(Oc7L4x>ZM~_4{
zWn%^grc5AC1YrTM8=F3}#jn4mnR@uT>nz8KK#i<xColAnP<2jB3NB45PA<wUD9Oyv
zD-NkFNELYTl5y(|mDZI>Gb(DUg`Rd#cJz~;{MwgCP{92M-#Hh-z*BFkk1y@t`9c*a
zBRTnjH_K!n-$D^P2l;c=@5@BnonCobU)=qhm4Oj#i5NCZ7?_}@@-i|bnZm`)z%m!)
zGLWfE46HyYbq+R0CPpR(w)Hq&939KV$jA&-#KOeH#LU1xA7+9ePzET%3ewNe01S&f
E05%+L^#A|>

delta 34
qcmbQTh;h+e#tkMCjBJxlB@8ClN@O!G+^G0Ne4{~y_-03sL^c4<+6%M*

diff --git a/.gradle/5.2.1/javaCompile/javaCompile.lock b/.gradle/5.2.1/javaCompile/javaCompile.lock
index 7b8bec29644a1844caea4ac2b9ad38ea03dbcd1f..2bef620a9890bd765bad4569cb4875fdd1966a7a 100644
GIT binary patch
literal 17
UcmZSHXmLQ5@z|MO1_)>e05Jaqc>n+a

literal 17
UcmZSHXmLQ5@z|MO1_-DI05J0eZ2$lO

diff --git a/.gradle/5.2.1/javaCompile/taskHistory.bin b/.gradle/5.2.1/javaCompile/taskHistory.bin
index c08c7a59d39d02bd2ac36cb8e8d6835e1a5de074..8a6f5b571e87efc2ee17283a74bebca532fc2088 100644
GIT binary patch
delta 153
zcmZ2Bm2ufr#tpt6;?V~g^)vEwQ}q*5ax?P`^<7envrF;|Cg1YVm^{%#K{KO)fq@~{
zn1O-uH4r}r;+r^in26z&(h$u}%*+$;y0PgqTm1T4nyH7cyUuc)xH-+!o{{?*&<X~I
I2B6s=06F3|Pyhe`

delta 152
zcmZ2Bm2ufr#tpt6G6}~R^)vEwQ}q*5ax?P`^*vKk69bC!vr>~wiYLo^>P(*CA)}dV
y%)r3-8i*f*Fn%2xlmB|~NaI(dD{wnajBo1uO+oEN>jZi7&RTDd@w8`T`~U#sNj6IW

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 489093fc07e572c1a9f69ff3fc27a141171c7806..84b08c09bef5e51271f97f4dba36a790327beb5f 100644
GIT binary patch
literal 17
UcmZQpD6R5Sla<b600YKV032Wf*Z=?k

literal 17
UcmZQpD6R5Sla<b600YKO031I8w*UYD

diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index d161effc5f4c1cf807334aa777b3672b2488b88d..b9f9fbcdf1d0a04122994584d3a2a23ef1df4220 100644
GIT binary patch
delta 476
zcmdlvg|UA+;|3E6M*YdA5*`A*Gs0ZA_w1O&00v&(lS?Hm1g02vEqgefQyVI1IeDps
zg2U3D{THuTeTaezZvPJjt7h0dkLF`u4-xlPhKuiNNVx9bTLx7>dGcO~84jnO`-Qg1
z?>`L{TnbZsCE(<LpS6ruQ1O#6@jGn2SyPLr>p;cxC;Lh&2)ttVZeEfdv<xEXZ8|ws
z(n5eEtN+I&r8G9EVC3YfK$Rkao$1y3?Ej$J|4&{kX~}OM@hRpy$62UY<K(+Qg$k*4
zIvgqu`B2^NlfME54dZV=d~oZfI8<fqWL_x+0gEU7y}S~^P<y;?PgVsA`t;0P=lJ1`
z0aSbKWLqf(jgXB^wJY3;!=QrMFh7O038tybua<-w`*w1ul!ZWQkg{Q3ZNes~V!_F+
yQc+ASl^Yd*h;KAlAiUYp;|Jqpf6w&E2_8a|1-vwYY+fK+W%36PGaz3DBnALqz^3*9

delta 87
zcmeC5&bV_5;|3E6Mw!W`5+0MMN*GMOD<Lu2R&v5*Q7MVZu2Ke*dx7*`DZ|NZ(&Cd%
nr6ne(0`XKJJ_^LVG6s`FWrCQPHf~h>A->TdLv*vF#}7sT)~_6E

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 310e0f2..13a8247 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e34b3f6..9646742 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a4f1ed25-49e5-4ec2-b119-1dfff0ee6e8a" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/cabinvoicegenerator/InVoiceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/cabinvoicegenerator/InVoiceService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/cabinvoicegenerator/InvoiceSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/cabinvoicegenerator/InvoiceSummary.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/com/cabinvoicegenerator/InvoiceServiceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/cabinvoicegenerator/InvoiceServiceTest.java" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -39,6 +41,7 @@
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="PropertiesComponent">
     <property name="last_directory_selection" value="$PROJECT_DIR$/src/main/java" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.0" />
@@ -189,7 +192,9 @@
       <map>
         <entry key="MAIN">
           <value>
-            <State />
+            <State>
+              <option name="COLUMN_ORDER" />
+            </State>
           </value>
         </entry>
       </map>
diff --git a/build/classes/java/main/com/cabinvoicegenerator/CabSubscriptionsType.class b/build/classes/java/main/com/cabinvoicegenerator/CabSubscriptionsType.class
new file mode 100644
index 0000000000000000000000000000000000000000..675cb8ca71eac75039ea5232211be1c09d417fe4
GIT binary patch
literal 1091
zcmb7C?{Csj6g`g?3SBogR1}=fA5$rtAj$j$S(pTqnKI0}kt}|CtrfeJb}5C#|4Lcn
zj7GE1{!zyJI^tN|7haS1`rbY7o^#K;zyEyy1z-y=GLW&Z;t8HASW)myg@%%t^fVS#
z3hDw;P9rPU4F#JFslD!gXUAZu7<MqI+T3#eap2lc-|?N0M?qL^amyT8LpyX&A~*1d
z2cJ%yI)n0dzunnA?9ktOZ^t-nn+(-=^JYnnxi@l#47HLz_hq>iymuI~hU+_fqk-jw
z2i)@LM2WL@KQO#18OMCgs~-3JRWk}*zhBqq6`3;vn|nPTx+49QL-zTAsB-`3Cs!M;
z??&4U`D^HR^&W#9eRQenjOq4$9*siEB$Y%U-LSps<>pN4wm%v)=F`1RkEEKxD72l|
zu5hJr-Ah)4JsOrp$E;|0jtax(JguN1kE({dSk<tIB@J0DF)UrWE~GOgZ7=Xi#LbdE
zQ&!hHcI=3RzMM6x<?-RLJ_Gyra96X|n>A`=jk;fI76ds!EAa!%MNtw(WMq)T4G=T!
z9?>d>IsyBN#5ttTv}3qMb1IHWgwNyl6u*T;e5&T;@;4;UAq#xs3jPkAXcs6HP>kc`
z2B8FF4HA8TQr=iSL+VQ$o~66IuHc@Kj{7lY4QV{U+EmCJDnyLR56DM3MLI+J6q$IV
p%JF6)`IAD@gnH^oo?yW|1rux+#i=Amm{BA#i7CTFvO^T}_%GXM|9}7h

literal 0
HcmV?d00001

diff --git a/build/classes/java/main/com/cabinvoicegenerator/InVoiceService.class b/build/classes/java/main/com/cabinvoicegenerator/InVoiceService.class
index 5a5e209ead6c5d0b03a9d2c537b89098d3af52bd..122f62bc1d46848cf4404f345f226326201ec213 100644
GIT binary patch
literal 2305
zcmb7FT~`}b6y1|dW|DLug(j4g(iX%vBnXxwT0SaBh>lHwCV*m9oJ>ZT5)vFHEO~b=
ze}k{S_}E%oaJ6gk1N;&G4xg<1CLx4Mie|0cd(S=R?6c23=id3_?-xe^#;_Sg4^k>V
z4#I;}0DgQT20egJaX-i*ts<k$4A7WAWhPu(1hIfcVY8&n4A-`lnX%d;fCtEmAr~al
zvWk@;y09t&d?tp^#rB$tFC?_hE#{Wjm*%tU%X(&Bf~1SRa%tB!O75yrtXN)RN)j$*
z^aVY$l38y!+|STFDM35dq-L{3h%9C2GkUY3Ko%$-2|dTkW1mxK;n%e_#CFFnSXpbQ
zylcB<XJ0}rZI-u3Oe1fX_R6+tZCEACF{m5Kp0b>jaFJHIN`BXL>>bx;UJ`~|de6OP
zyS%?+5kr}>OSXGY!tK_9&vYGJl_1ZR3zmdX+AdiOmF>LcEF1YEcRJH$(<rVQjxFT+
zrtEIoq}V!+URo6y=PYNB6UlWF#H<tz*IF*SMloeL#P-FK`XEaaa8LI91zQx=q*`|E
zZBA`D*D$v-#!fxB9(&mGXvD!z4z^V5wL;`7+uMe-Pg=65nS^UCJ*t3YD(sl?^>ae2
zn3CW(3I*Xu`>|O1k+Elt6phlxNX~Wa(#GUD5TY7NW!G}_f;jzuxpQ;Fa+@*{sYsYQ
zBhvpkh+wW<aZD>^i<)0LUA|$#K|=x$CEWaPEv?}eVj2b!SMjBWuMpSpHP+wYe>$X!
zZ!{RlYcK^wLBo6K(=d)+4Wqd8Mx5$htCv`?wlv(shZ?@chH(CXx9#Lm7xRxS)0N<j
ziE|%nmEBqQhGkk<%w}fOTv*>#j3VnDX|6&IdvcKPSNloCjNxuF-nQ|5^#UZt1yJiR
ziiE4J7>I@v4ti1$^|J-)Eq13lWWB`(&*?Gr@n!AdTj$3WTtzQ<1;opT>y&R$dn^Yi
z_czHGD8JQYKS25ICVhzV%_g~nnCt{%Lo@?NAF&e{;`k1w6?ka@MB;~#;xFM@JB0T+
z<apvae7{oRf%s~4LguJ(yoeCm5Jo#jxYJd0#=E#pi7?e5eD6h*)I+?WmqK0YDU|p#
z_zs}{gzj5m1h#tR%^%IXa<?4Dh2PQk_$k^?S%kKFeGQ8aVbT7WNZu-^Yf!lklT8Fs
zGU>-<a_Yt;r6dnm@Ec>gQ3N>mk;P<VMK%r2Dbd>GD)!jlM1P-a8J>Qz%YLor@f)-7
zQ#0MJCnn^md^GO!jw=x*;`<qWQ8}WFPN=bXRDFg^VhA4~V(LFA(l4+6e2K2L#8K=J
zm!A-zM!$>Hz<PUF?;a8u;ylXQ3fggo??DIdVxpSlbc5_Plb9kQ4`-2-r%JXPo>x2v
zMTK9*w3mO0`TT_eTJq}E6G$_%_`U{t#&Tll0Np1A7N2{tQv&Q2!Qe*CvJp3k8O#!g
z-c<%3u0O(D9r*#h1#+m0e1K>sPWUS#*;@b9;1h%&YJv|n;6ruz0MA$?DBzP-@A-cK
DsVM?5

delta 881
zcmZ8eO-~b16g_WdI@3<4Egvnm)M~3J*rB3`3euMP0gCbwBO6v`sErn|5}mkhNHlCU
z^8;MER1+*l5`KUyw{Bdyck4<#uPsgEEbhDa-E+@9@62}J@6f|<f4?38n831$eoPve
zGNE8H03WUynAS@}?DEq~(N<z2k3s-N%*aqO3A}FLhKVq4%F$ag%*yLI1GnG4Uh!;^
z59;}9t?Cv9)DiEO*iQN%RbRMHty~e%-0D*v0r#2fY|c5)y*J9ceu2;f*C}r-I$JBw
z+GfQ-&Kp;Ms41NA!kVonaok(d?D!oE^SEo^o`thWSQtjk!Vu1|nex6X*06;X7A#!A
zMGK2qlFf4hJ?qX(XKd4{Jsw+LTd$N|Z`PObwtUsPk1hZj1`$OJ0t2iR9Ah0vqEqXv
z2fJ!NF_c8Cj~I$%JjtpEl^M{J-Gj*PLs{K}`Wf1%CTp5ex<z-nF^CLMht(RuDV%0Q
z$j7wF9D;P-#fGEMH&WV@o${0x*P`%$f%$<A1!=|>W0*t{$%rh+IMgPT8J%h_iAlSt
z&_Vzsywf23(jU3c+c9$WV8Ymi)j+5`|4J9{4}b0>ylNke>>=`zoN9C50N)I{rqHn@
z`9^t;)3Kx7N%T^K4TGpcM@50S92Y5=Zthlap8YtKLxi9k@EI7Zs|-Q_f2c~xe<+m^
zw!qaYPcyp<%^q!_=YK<!d{U|@A>BfD7Mm1zi9FIMDM4XAfy-^?`>Z8%L^3bi4fHN%
f$=@fR+ih=}{FyHPNQXbt<`3{+9r0gjPG9{8S1n_v

diff --git a/build/classes/java/main/com/cabinvoicegenerator/InvoiceSummary.class b/build/classes/java/main/com/cabinvoicegenerator/InvoiceSummary.class
index ea821de326d3982699cefcc244dcd494a45139d7..b0c2592f2cfba128427092882d0b4c0d4370771b 100644
GIT binary patch
literal 1297
zcma)5OHUI~6#i~I?X+cDu%)0<5JhqNfTH4)he#_)Ns+`F5?z?wwqqG+XX-E|F~+t3
z!Ic|z!$Knzqlt0l!rx?!=gu@xLL_D~=Y7xl&N=t~`t$WWfN3m+5JfTwKT?9E1<458
zgpA1$vY3)_C4>Ny0bCXQnjq5wTo?RC05=7{CCF_VcNjuOtFij*p<dOt7+8TJXqz^#
zFL6sFJ<rg?w>68`G}q#v)eYUAXYi?od~%IJ%9&M)>@Dhs_Mp`$Yt|!Pu9GENG%LKm
z#w}gw9iwEg>r_WAR?J4W!ppj`ZR!=RrWsVjHmz*IHI!P72De_!F!;6SEncTHakaR?
zw|TbCjaqiKyrEU>ndB3~Xo_0LT!hSC=QcyQWb?}A3U78G1Z=ZpTe?wW=vR|n2VE<b
z43*55RneAo(MIejqDfIm!D-AWh@oFW90Ljl1)0Sh!}$L-CSzW~T`VvR9wK)EEVlG|
zRkIk*9<BWHa8Yv#?qN}o9D|Y>J=mDzpq)iBqg`8btoIdM!Z<_UVLf+<3|>_%GEmd(
zT%B*xsAEUw;uvWxT_^Kq%h|C^-8P+@;#2eaB;6iAZ#Fff$}rKruFhzWPrK7BWlyMu
zlim4~-MN3eah@JYl%9{5C@qbosMwpsX?2c=(N52RrcT->e2|C_r}n{8LwoR~)IE4p
zsa+zw@VqwnAbp|$4~B>iP&g2xBRvR0K?GqWh$hH7N<}FVeIvw$Bmgi+5)eEjpQ9+Z
z@Mp>);+IqD_wY$O>7R(C+VG|6e+Qp;C;bEd6#*eb|67a^6NtQDAiqJJG>J6H(PZfZ
zB<~Jo^ExO;Ad?&=8lzVG2}vANgkYX-Z-L}Pw95x*muYkt2-`3wFh(7CaFKF^;gcim
zH?lJP3-kcR#p*Qhl!}SwroSQZcpt%NsEr<hw+$s4c4coHk!Y_gOC<NbYNM}>Qy=M^
VJ5axqBjG?&+<YBK440iK^)HEH6lMSb

delta 283
zcmYL?OH#s65Jk^RG%til!1x7>e4+t=Vd4TPM-(fdih&ETTudr6m*T($IJ4XWJ8()-
zbZ4NGdvA63xm`v-LGiWw_ynGKhzLm=1YD^MRE9bmS;i3=*Or@d^;^A}tQV6z8bppJ
z&e2ktFg4`mcOF`99e3PU3-6_1Bt@aT@JSSrlqglZfZ`s8n6_xAdi4u)RK5HCSt6UE
zP>^!WiMS?hFm=)nB~Ll4$&J4ja(<9K|C7r<a>+Rta+mT*SK2&!($eD4#%9aR63mUP
J`!e*n+yg<$8T<eM

diff --git a/build/classes/java/test/com/cabinvoicegenerator/InvoiceServiceTest.class b/build/classes/java/test/com/cabinvoicegenerator/InvoiceServiceTest.class
index 2b5801c562a5460c43b26458307af27b766a2d0e..4246bce860e301e2d9bf332e7e9350f0ce6e73f6 100644
GIT binary patch
literal 3608
zcmcIn?RFAZ6y1{y0}@P9@}co#xooQv6GPP)%||0KB$Wyz29k<a?EoWA3Nvw-N$WH8
z3EF4qpY}&$>uMjM|NA;!-FF5EK?qtcS!?FboqNvNd*6L7<gb5z{}aG8z6;`0eBsC4
zV@Tl3AbN05iSdp2h^M3yo2@^kkXCO0_M`axq{N23X+PG27{Iz%eBX}^CAL^!A4VpK
z6tV$qinm+h^3^dsKrV=fcqA%*t;FKqawRrhAEfJ<AN%n{g0i3+y1gi&H!{8@L0&eC
znuLL*ZfI$zlGm)PnlE!EoHPq+c}ul)@m!mf?dN(`!ep{wR-y$puN%9jUeHRKp;@YJ
zTG50zk<qMO&S$l%Jul&UN#E6sxL&nYqo6Gr#jIY@R!u8yS{1eYH1pha%Eb-Mb}S=n
z+G=@KwFD&H*b>QWxhx5hBg!@}WywIXR!xEwCrg_ZIZSZ)%*{Tw;TU3aORwtWw`3Ts
zZ0n{$dV@*RDn+*)>J+U}m~|;6wQBXPXr!od#i@8iX5846Q?~V;vbLcYwQ76vb@7}^
zMYUc^=s&E01fL~>C7gTIQ3;Wr{QcE>lA}a(H!tI@WYDPg{f<_!wPGufn=XURs%9mM
z+`f09pg3-ju+z4>t47PJQHo}4OE*d^INiY*>y}p0ok}NX%pI{A?LrUjhR3CKH`;}@
zs&K2l3U3n{%$SZ<&{lQPStsg=51M33h!esET$FIJb8j`9+>fUrd;>QsA3^~|KeP~@
zp(No<rxar6M49IzKtHlpvo}P@w#fZ0ou$U|Q_LSi8N3)U{n!cN1uQ?RA=q$2*o7+L
zawiaP(r3#ZxMMB9O%w8v=@h@L<}*&dTCnsTw_&p{cc`k8UfW15B_&LC?2UGTbm7&`
zEz&kZ9GhXDjRmKy+FH|z<%`4<<2-E!4~~zeD*aC~A=MqMyl~Vq8(4|N<8hJ44dFcz
z>C)2U9a+`oY_zd2l5lfhiZu0{r|SHhGXh0GEqYDOmTV5HHEK6#LXVPWHv#d^uZ1?b
z-hoGxCo(UqwpQVHmg!K;5s!s#M%Q_e*hHzR6>j8^Yof!`H0+L8R5lpbjHf1upzmMb
zSV<)|Q#g-L`28(D#~_Jr<n<DtqP$DI`!4T8`h|lYM0i!)Nd@B^hr9*2j0rx`y$tSg
zgMZ*UKj$vIMo;cn^zK7W4#SrS%*Ydw5qS^(S>G@MCw={|5IjhJiechMLm&SJm_Cf-
zIE{Yd8*mFw!zYr~3ija?u3(CV2QW&!pRsrtL%51-kQo=mb<X+t6UBplgLertT|o9F
z<U=5jw+A^yh{G&A!jhvbc7h;JelU<X8z6s1z$Lxfq@?c;4CH!W^FmDn`xwmRWbdg@
z7Eh^($vu3OevNRBDi7^rWKJHFue`!&tJG)6;w<;=JSF=Ww`qkH@(_FLNxj;TdLFl2
zsV6D=EaoWnHS(Xw0(u$e$LAc$EmAKwSo}>EVrz3vEW#&J-H4<oCa>(_q@Xi4M~Vl0
ze81w<m~RiK$9!Y*Az~NlW6-L7q|s0KQF`PCp)YWhpdaqj9}fs#kX-aYHAtpwB>QoX
zq+%o)<vT&Qm+@y^x-zp2x^!EewbY>7V*fMk?SHntvt|hWCY^PQ&YGpO=C~vCO?&cw
z_P^5wWUKwpwFh~dAY%l%M38p~a+x6G9}MJj17wT+T_wA@=CJ+GA7THyWRal#Q}jcc
zJHAHyuQ#!HKl{fUEL!aEviPs|clmU)f0o2HY5y%6I7j<Gq<tTWf0k(f$F%>G|H1w%
JY^WZr{tFOFB%uHR

literal 2396
zcmb_dTUQ%Z7~PXhG9jdZ;eKhU*xH0!XvHcQ(*OaDCR7QaSY56mIZcO^OmHr&`VagI
z`VV~cL8!9y(FcE2SNEAoLZAiuVAjgaIp6udz4v#Sng3q?^$&n~d>_Rq(i$E`5kR^F
zBglj^Jdr<XS_x+sn!8o3g&+O-i~Ri>&h+_a4cREVu`ZoAG<+J)q?`V6d=|wjauIwk
zPrs0tyoQ2?O$FVCxm!0%qA08*-Yf-)e5qbbmGphXJd!6BVG2uk>Q*Xu&UHyac-b%w
zC#@iuNbV|7*Xm_K$h={SO}Dl$tZjY2N=rOnFX`1?-7@69VN{)GhOJ=w3ObL!p=?{&
z4k<&naCQzAMAx5}#Gzx<O<Tib1;bme=@>P!YuE-kR!p<*=-#nMZ&gwUF14ms#nZYa
z2sBwSj)a*tY)3as^e=BS`iJ7Px?3%83CFd}Z6Z`Rbc+c@$_+mSN|uRACN6VaKJ^@W
z^7R%)L+PAHkQcUn6-j{=thqIxX2uICxK+nEtcoq8EbMcNa(+jOZmp(UKPl)s-#k{w
zk}(R#pIlm1iOTdfy9shtzx@XIo(vig&kse(5#@_QW<B9Mwy<(#mhyV#Vb}AOy*bd2
z^i)+hE2*Mm8D@n%(PG`TN@By1!!y_<^CwhRcUH#4a0}xK-haDkjbRKoWB3wZY1oRP
zh;0R9mxW6G5`ISpaIml7Xs?hA`C4Ls!}{u({aND2u!nDBc!KXZa+mSFo}q%Cv${Oq
zKVa1r^q!eo)6WX>(JHxB-4SgA8%ktzNlt3d*;uaFEICnPy0=*W(bcOQm2e`P&B~|O
z3*kMNxMp~gm(Er*kJiA15;+h1UZSndemYC9TcnDJUiQaF!F+pAV>YgnMud1pIBi1w
zCuR8!SZ|#N-sSsvl&@2Te~uBaVXirTyx!(6ji7hdGkF4K@)Uu+69oT&`a918jP~E*
zfCd#EnBYF<`{O;_;ZDI_Vg)^{6-EST>uA8_FM`}a1YI7;fbZA<i4aDL<G3<h<^3KK
zTuG@(k7SZ00gvQoS~c1xnk0P)<suK&sYJhe3~eFQhsaQ<>jk1`>?4c;;$-io{62nc
z`Z0t7rZ?!RnMX(>w$zL?)WqmBg=sQ(GjayA)HcMAT8g$%OW~ZS@cvZ_J9Fweg*V=;
zaFhzisPHEFZjou63UB{!3Lmr-{ze{|@mjNnp}*0+7d+*K)r_2=r?{v3yG~W^3RBa^
zcxUqz@jceJ_XPcm>aaTV0s|L|e236?*|Y?Ul*BS7`T3q|OJS{5<RyIIwLHlQoyUhP
za*C~ah>ti;%WUz-T&Wj|ywFPFU-HPNQj<5b`S@Vrx-2%Qre}^ZBy$;FWPWGKgoZ=I
z>bYzthz}}?U=E$Q&xX(A0aY$g;Rclzs82o(X<tPvtBpohomj&nmYCHv{bYVY#`b&p
RsYHl)`CS~MWg-Uf$tz{`7%%_;

diff --git a/build/reports/tests/test/classes/com.cabinvoicegenerator.InvoiceServiceTest.html b/build/reports/tests/test/classes/com.cabinvoicegenerator.InvoiceServiceTest.html
index 7bb277e..345e304 100644
--- a/build/reports/tests/test/classes/com.cabinvoicegenerator.InvoiceServiceTest.html
+++ b/build/reports/tests/test/classes/com.cabinvoicegenerator.InvoiceServiceTest.html
@@ -23,7 +23,7 @@ <h1>Class com.cabinvoicegenerator.InvoiceServiceTest</h1>
 <tr>
 <td>
 <div class="infoBox" id="tests">
-<div class="counter">4</div>
+<div class="counter">8</div>
 <p>tests</p>
 </div>
 </td>
@@ -41,7 +41,7 @@ <h1>Class com.cabinvoicegenerator.InvoiceServiceTest</h1>
 </td>
 <td>
 <div class="infoBox" id="duration">
-<div class="counter">0.002s</div>
+<div class="counter">0.011s</div>
 <p>duration</p>
 </div>
 </td>
@@ -63,6 +63,9 @@ <h1>Class com.cabinvoicegenerator.InvoiceServiceTest</h1>
 <li>
 <a href="#tab0">Tests</a>
 </li>
+<li>
+<a href="#tab1">Standard output</a>
+</li>
 </ul>
 <div id="tab0" class="tab">
 <h2>Tests</h2>
@@ -75,27 +78,55 @@ <h2>Tests</h2>
 </tr>
 </thead>
 <tr>
-<td class="success">givenDistanceAndTime_ShouldReturnTotalFare</td>
+<td class="success">givenDistanceAndTimeForNormal_ShouldReturnTotalFare</td>
+<td class="success">0.001s</td>
+<td class="success">passed</td>
+</tr>
+<tr>
+<td class="success">givenDistanceAndTimeForPremium_ShouldReturnTotalFare</td>
 <td class="success">0s</td>
 <td class="success">passed</td>
 </tr>
 <tr>
-<td class="success">givenLessDistanceAndTime_ShouldReturnMinimumFare</td>
-<td class="success">0.001s</td>
+<td class="success">givenLessDistanceAndTimeForNormal_ShouldReturnMinimumFare</td>
+<td class="success">0s</td>
 <td class="success">passed</td>
 </tr>
 <tr>
-<td class="success">givenMultipleRides_ShouldReturnInvoiceSummary</td>
+<td class="success">givenLessDistanceAndTimeForPremium_ShouldReturnMinimumFare</td>
 <td class="success">0s</td>
 <td class="success">passed</td>
 </tr>
 <tr>
-<td class="success">givenUserIdAndRides_ShouldReturnInvoiceSummary</td>
+<td class="success">givenMultipleRidesForNormal_ShouldReturnInvoiceSummary</td>
+<td class="success">0.002s</td>
+<td class="success">passed</td>
+</tr>
+<tr>
+<td class="success">givenMultipleRidesForPremium_ShouldReturnInvoiceSummary</td>
+<td class="success">0.001s</td>
+<td class="success">passed</td>
+</tr>
+<tr>
+<td class="success">givenUserIdAndRidesForNormal_ShouldReturnInvoiceSummary</td>
 <td class="success">0.001s</td>
 <td class="success">passed</td>
 </tr>
+<tr>
+<td class="success">givenUserIdAndRidesForPremium_ShouldReturnInvoiceSummary</td>
+<td class="success">0.006s</td>
+<td class="success">passed</td>
+</tr>
 </table>
 </div>
+<div id="tab1" class="tab">
+<h2>Standard output</h2>
+<span class="code">
+<pre>InvoiceSummary{numOfRides=2, totalFare=60.0, averageFare=30.0}
+InvoiceSummary{numOfRides=2, totalFare=30.0, averageFare=15.0}
+</pre>
+</span>
+</div>
 </div>
 <div id="footer">
 <p>
@@ -104,7 +135,7 @@ <h2>Tests</h2>
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<a href="http://www.gradle.org">Gradle 5.2.1</a> at 16-Dec-2019, 6:15:10 PM</p>
+<a href="http://www.gradle.org">Gradle 5.2.1</a> at 17-Dec-2019, 10:14:45 AM</p>
 </div>
 </div>
 </body>
diff --git a/build/reports/tests/test/index.html b/build/reports/tests/test/index.html
index 85e6e70..1ff9a7b 100644
--- a/build/reports/tests/test/index.html
+++ b/build/reports/tests/test/index.html
@@ -20,7 +20,7 @@ <h1>Test Summary</h1>
 <tr>
 <td>
 <div class="infoBox" id="tests">
-<div class="counter">4</div>
+<div class="counter">8</div>
 <p>tests</p>
 </div>
 </td>
@@ -38,7 +38,7 @@ <h1>Test Summary</h1>
 </td>
 <td>
 <div class="infoBox" id="duration">
-<div class="counter">0.002s</div>
+<div class="counter">0.011s</div>
 <p>duration</p>
 </div>
 </td>
@@ -82,10 +82,10 @@ <h2>Packages</h2>
 <td class="success">
 <a href="packages/com.cabinvoicegenerator.html">com.cabinvoicegenerator</a>
 </td>
-<td>4</td>
+<td>8</td>
 <td>0</td>
 <td>0</td>
-<td>0.002s</td>
+<td>0.011s</td>
 <td class="success">100%</td>
 </tr>
 </tbody>
@@ -109,10 +109,10 @@ <h2>Classes</h2>
 <td class="success">
 <a href="classes/com.cabinvoicegenerator.InvoiceServiceTest.html">com.cabinvoicegenerator.InvoiceServiceTest</a>
 </td>
-<td>4</td>
+<td>8</td>
 <td>0</td>
 <td>0</td>
-<td>0.002s</td>
+<td>0.011s</td>
 <td class="success">100%</td>
 </tr>
 </tbody>
@@ -126,7 +126,7 @@ <h2>Classes</h2>
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<a href="http://www.gradle.org">Gradle 5.2.1</a> at 16-Dec-2019, 6:15:10 PM</p>
+<a href="http://www.gradle.org">Gradle 5.2.1</a> at 17-Dec-2019, 10:14:45 AM</p>
 </div>
 </div>
 </body>
diff --git a/build/reports/tests/test/packages/com.cabinvoicegenerator.html b/build/reports/tests/test/packages/com.cabinvoicegenerator.html
index b8aa104..5cab5d3 100644
--- a/build/reports/tests/test/packages/com.cabinvoicegenerator.html
+++ b/build/reports/tests/test/packages/com.cabinvoicegenerator.html
@@ -22,7 +22,7 @@ <h1>Package com.cabinvoicegenerator</h1>
 <tr>
 <td>
 <div class="infoBox" id="tests">
-<div class="counter">4</div>
+<div class="counter">8</div>
 <p>tests</p>
 </div>
 </td>
@@ -40,7 +40,7 @@ <h1>Package com.cabinvoicegenerator</h1>
 </td>
 <td>
 <div class="infoBox" id="duration">
-<div class="counter">0.002s</div>
+<div class="counter">0.011s</div>
 <p>duration</p>
 </div>
 </td>
@@ -80,10 +80,10 @@ <h2>Classes</h2>
 <td class="success">
 <a href="../classes/com.cabinvoicegenerator.InvoiceServiceTest.html">InvoiceServiceTest</a>
 </td>
-<td>4</td>
+<td>8</td>
 <td>0</td>
 <td>0</td>
-<td>0.002s</td>
+<td>0.011s</td>
 <td class="success">100%</td>
 </tr>
 </table>
@@ -96,7 +96,7 @@ <h2>Classes</h2>
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<a href="http://www.gradle.org">Gradle 5.2.1</a> at 16-Dec-2019, 6:15:10 PM</p>
+<a href="http://www.gradle.org">Gradle 5.2.1</a> at 17-Dec-2019, 10:14:45 AM</p>
 </div>
 </div>
 </body>
diff --git a/build/test-results/test/TEST-com.cabinvoicegenerator.InvoiceServiceTest.xml b/build/test-results/test/TEST-com.cabinvoicegenerator.InvoiceServiceTest.xml
index 9d848be..1897185 100644
--- a/build/test-results/test/TEST-com.cabinvoicegenerator.InvoiceServiceTest.xml
+++ b/build/test-results/test/TEST-com.cabinvoicegenerator.InvoiceServiceTest.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="com.cabinvoicegenerator.InvoiceServiceTest" tests="4" skipped="0" failures="0" errors="0" timestamp="2019-12-16T12:45:10" hostname="admin1-desktop" time="0.003">
+<testsuite name="com.cabinvoicegenerator.InvoiceServiceTest" tests="8" skipped="0" failures="0" errors="0" timestamp="2019-12-17T04:44:45" hostname="admin1-desktop" time="0.012">
   <properties/>
-  <testcase name="givenLessDistanceAndTime_ShouldReturnMinimumFare" classname="com.cabinvoicegenerator.InvoiceServiceTest" time="0.001"/>
-  <testcase name="givenUserIdAndRides_ShouldReturnInvoiceSummary" classname="com.cabinvoicegenerator.InvoiceServiceTest" time="0.001"/>
-  <testcase name="givenDistanceAndTime_ShouldReturnTotalFare" classname="com.cabinvoicegenerator.InvoiceServiceTest" time="0.0"/>
-  <testcase name="givenMultipleRides_ShouldReturnInvoiceSummary" classname="com.cabinvoicegenerator.InvoiceServiceTest" time="0.0"/>
-  <system-out><![CDATA[]]></system-out>
+  <testcase name="givenMultipleRidesForNormal_ShouldReturnInvoiceSummary" classname="com.cabinvoicegenerator.InvoiceServiceTest" time="0.002"/>
+  <testcase name="givenDistanceAndTimeForPremium_ShouldReturnTotalFare" classname="com.cabinvoicegenerator.InvoiceServiceTest" time="0.0"/>
+  <testcase name="givenDistanceAndTimeForNormal_ShouldReturnTotalFare" classname="com.cabinvoicegenerator.InvoiceServiceTest" time="0.001"/>
+  <testcase name="givenUserIdAndRidesForPremium_ShouldReturnInvoiceSummary" classname="com.cabinvoicegenerator.InvoiceServiceTest" time="0.006"/>
+  <testcase name="givenLessDistanceAndTimeForPremium_ShouldReturnMinimumFare" classname="com.cabinvoicegenerator.InvoiceServiceTest" time="0.0"/>
+  <testcase name="givenMultipleRidesForPremium_ShouldReturnInvoiceSummary" classname="com.cabinvoicegenerator.InvoiceServiceTest" time="0.001"/>
+  <testcase name="givenLessDistanceAndTimeForNormal_ShouldReturnMinimumFare" classname="com.cabinvoicegenerator.InvoiceServiceTest" time="0.0"/>
+  <testcase name="givenUserIdAndRidesForNormal_ShouldReturnInvoiceSummary" classname="com.cabinvoicegenerator.InvoiceServiceTest" time="0.001"/>
+  <system-out><![CDATA[InvoiceSummary{numOfRides=2, totalFare=60.0, averageFare=30.0}
+InvoiceSummary{numOfRides=2, totalFare=30.0, averageFare=15.0}
+]]></system-out>
   <system-err><![CDATA[]]></system-err>
 </testsuite>
diff --git a/build/test-results/test/binary/output.bin b/build/test-results/test/binary/output.bin
index e69de29..3a1fafe 100644
--- a/build/test-results/test/binary/output.bin
+++ b/build/test-results/test/binary/output.bin
@@ -0,0 +1,2 @@
+
?InvoiceSummary{numOfRides=2, totalFare=60.0, averageFare=30.0}
+
	?InvoiceSummary{numOfRides=2, totalFare=30.0, averageFare=15.0}
diff --git a/build/test-results/test/binary/output.bin.idx b/build/test-results/test/binary/output.bin.idx
index f76dd238ade08917e6712764a16a22005a50573d..b8599ea55d833836a590e287f66da048fd169809 100644
GIT binary patch
literal 69
ZcmZQ%Vq#@L1OL$gCsf`UMx)992LLP<AbJ1*

literal 1
IcmZPo000310RR91

diff --git a/build/test-results/test/binary/results.bin b/build/test-results/test/binary/results.bin
index 08829f58e3dfad8d979e4f70cbda0371dd2c3d1f..4315cf972ec8b26ec059f9e755dffcbd2191e531 100644
GIT binary patch
literal 1086
zcmbu7%TB{E5Je{~l(OYJP}gjcP(`6dC<$xiCZjS^Y@@LqiEm;H;`MU`H?;_am+^As
ztK)OW!(?z<XgMjwl2om!z!fTFVKq-?>p_NGH}f2g{lis&MDOh%9FLQS71gK~uCjDp
zVM-;Mspd1yQdF1Om3CE`qIIk`JSU~#o5&apTJi}D?>+g5j1{WDLsjM^v0<MxN^-IT
z&$SiRR4_(`pgG?66t?cZp!OICXiNr@mN|#*C(pbv$g{HX+?3oW+HE;H2&0ys!sx}*
z=V;9Dx?YeX>Ev76|A>apQ`mX*FZlS!e%6o8h3+#LKYwH2v-5ZI@yXzx!S34O)9!oF
L-POnDf_o0Hc0HK+

literal 516
zcmb7=OA5j;5I|E~w;rW;5JV{0jjd~m=}-sqk$eiCso>`TF0~%Z8nxg?$t;IAJl@37
zsAWo|jBZdi3K`TOK~t-An!OeU=%(M7U~B+NNTep0(>00CH8vm@V9X4SrINu^RwW8p
z7hC0cwFK+5%u%9nVoo&#ACTy6yOH?lZ7Tyht9s88D==T8Pn8pb>U|(Sm^zZQ-t?=f
fRF?8*Q2<K%@t^C+_}~q>;}&-u{-uP`gXc~jUW>;t

diff --git a/src/main/java/com/cabinvoicegenerator/CabSubscriptionsType.java b/src/main/java/com/cabinvoicegenerator/CabSubscriptionsType.java
new file mode 100644
index 0000000..f86e0d9
--- /dev/null
+++ b/src/main/java/com/cabinvoicegenerator/CabSubscriptionsType.java
@@ -0,0 +1,5 @@
+package com.cabinvoicegenerator;
+
+public enum CabSubscriptionsType {
+    NORMAL, PREMIUM
+}
diff --git a/src/main/java/com/cabinvoicegenerator/InVoiceService.java b/src/main/java/com/cabinvoicegenerator/InVoiceService.java
index f281149..dde94c3 100644
--- a/src/main/java/com/cabinvoicegenerator/InVoiceService.java
+++ b/src/main/java/com/cabinvoicegenerator/InVoiceService.java
@@ -1,18 +1,30 @@
 package com.cabinvoicegenerator;
 
-import java.awt.*;
-import java.util.List;
-
 public class InVoiceService {
 
     private static final int COST_PER_TIME = 1;
     private static final double MINIMUM_COST_PER_KM = 10;
     private static final double MINIMUM_FARE = 5;
+    private static final int PREMIUM_COST_PER_TIME = 2;
+    private static final double PREMIUM_MINIMUM_COST_PER_KM = 15;
+    private static final double PREMIUM_MINIMUM_FARE = 20;
+
+    public InVoiceService(CabSubscriptionsType cabSubscriptions) {
+        this.cabSubscriptions = cabSubscriptions;
+    }
+
     private RideRepository rideRepository = new RideRepository();
+    CabSubscriptionsType cabSubscriptions;
 
     public double calculateTotalFare(double distance, int time) {
-        double totalFare = distance * MINIMUM_COST_PER_KM + time * COST_PER_TIME;
-        return Math.max(totalFare, MINIMUM_FARE);
+        if (CabSubscriptionsType.NORMAL.equals(cabSubscriptions)) {
+            double totalFare = distance * MINIMUM_COST_PER_KM + time * COST_PER_TIME;
+            return Math.max(totalFare, MINIMUM_FARE);
+        } else if (CabSubscriptionsType.PREMIUM.equals(cabSubscriptions)) {
+            double totalFare = distance * PREMIUM_MINIMUM_COST_PER_KM + time * PREMIUM_COST_PER_TIME;
+            return Math.max(totalFare, PREMIUM_MINIMUM_FARE);
+        }
+        return 0.0;
     }
 
     public InvoiceSummary calculateTotalFare(Ride[] rides) {
@@ -23,13 +35,13 @@ public InvoiceSummary calculateTotalFare(Ride[] rides) {
         return new InvoiceSummary(rides.length, totalFare);
     }
 
-    public void addRides (String userId, Ride[] rides) {
-        rideRepository.addRides(userId,rides);
-
+    public void addRides(String userId, Ride[] rides) {
+        rideRepository.addRides(userId, rides);
     }
 
     public InvoiceSummary getInvoiceSummmary(String userId) {
-      Ride[] rides=rideRepository.getRides(userId);
+        Ride[] rides = rideRepository.getRides(userId);
         return this.calculateTotalFare(rides);
     }
 }
+
diff --git a/src/main/java/com/cabinvoicegenerator/InvoiceSummary.java b/src/main/java/com/cabinvoicegenerator/InvoiceSummary.java
index 4e9c0ce..ff0a95a 100644
--- a/src/main/java/com/cabinvoicegenerator/InvoiceSummary.java
+++ b/src/main/java/com/cabinvoicegenerator/InvoiceSummary.java
@@ -22,4 +22,13 @@ public boolean equals(Object o) {
                 Double.compare(that.totalFare, totalFare) == 0 &&
                 Double.compare(that.averageFare, averageFare) == 0;
     }
+
+    @Override
+    public String toString() {
+        return "InvoiceSummary{" +
+                "numOfRides=" + numOfRides +
+                ", totalFare=" + totalFare +
+                ", averageFare=" + averageFare +
+                '}';
+    }
 }
diff --git a/src/test/java/com/cabinvoicegenerator/InvoiceServiceTest.java b/src/test/java/com/cabinvoicegenerator/InvoiceServiceTest.java
index f7c45b1..b2df1d2 100644
--- a/src/test/java/com/cabinvoicegenerator/InvoiceServiceTest.java
+++ b/src/test/java/com/cabinvoicegenerator/InvoiceServiceTest.java
@@ -1,41 +1,34 @@
 package com.cabinvoicegenerator;
 
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 public class InvoiceServiceTest {
 
-    InVoiceService inVoiceServicer = new InVoiceService();
-
-    @Before
-    public void setUp() throws Exception {
-        InVoiceService inVoiceServicer = new InVoiceService();
-    }
-
     @Test
-    public void givenDistanceAndTime_ShouldReturnTotalFare() {
-        InVoiceService inVoiceServicer = new InVoiceService();
+    public void givenDistanceAndTimeForNormal_ShouldReturnTotalFare() {
+        InVoiceService inVoiceServicer = new InVoiceService(CabSubscriptionsType.NORMAL);
         double distance = 2.0;
         int time = 5;
-        double fare = inVoiceServicer .calculateTotalFare(distance, time);
+        double fare = inVoiceServicer.calculateTotalFare(distance, time);
         Assert.assertEquals(25, fare, 0.0);
     }
 
     @Test
-    public void givenLessDistanceAndTime_ShouldReturnMinimumFare() {
-        InVoiceService inVoiceServicer = new InVoiceService();
+    public void givenLessDistanceAndTimeForNormal_ShouldReturnMinimumFare() {
+        InVoiceService inVoiceServicer = new InVoiceService(CabSubscriptionsType.NORMAL);
         double distance = 0.1;
         int time = 1;
-        double fare = inVoiceServicer .calculateTotalFare(distance, time);
+        double fare = inVoiceServicer.calculateTotalFare(distance, time);
         Assert.assertEquals(5, fare, 0.0);
     }
 
     @Test
-    public void givenMultipleRides_ShouldReturnInvoiceSummary() {
-        InVoiceService inVoiceService = new InVoiceService();
+    public void givenMultipleRidesForNormal_ShouldReturnInvoiceSummary() {
+        InVoiceService inVoiceService = new InVoiceService(CabSubscriptionsType.NORMAL);
         Ride[] rides = {new Ride(2.0, 5),
-                new Ride(0.1, 1)
+                new Ride(0.1, 1),
+
         };
         InvoiceSummary summary = inVoiceService.calculateTotalFare(rides);
         InvoiceSummary expectedInvoiceSummary = new InvoiceSummary(2, 30.0);
@@ -43,8 +36,8 @@ public void givenMultipleRides_ShouldReturnInvoiceSummary() {
     }
 
     @Test
-    public void givenUserIdAndRides_ShouldReturnInvoiceSummary() {
-        InVoiceService inVoiceService = new InVoiceService();
+    public void givenUserIdAndRidesForNormal_ShouldReturnInvoiceSummary() {
+        InVoiceService inVoiceService = new InVoiceService(CabSubscriptionsType.NORMAL);
         String userId = "a@b.com";
         Ride[] rides = {new Ride(2.0, 5),
                 new Ride(0.1, 1)
@@ -52,6 +45,51 @@ public void givenUserIdAndRides_ShouldReturnInvoiceSummary() {
         inVoiceService.addRides(userId, rides);
         InvoiceSummary summary = inVoiceService.getInvoiceSummmary(userId);
         InvoiceSummary expectedInvoiceSummary = new InvoiceSummary(2, 30.0);
+        System.out.println(expectedInvoiceSummary);
+        Assert.assertEquals(expectedInvoiceSummary, summary);
+    }
+
+    @Test
+    public void givenDistanceAndTimeForPremium_ShouldReturnTotalFare() {
+        InVoiceService inVoiceServicer = new InVoiceService(CabSubscriptionsType.PREMIUM);
+        double distance = 2.0;
+        int time = 5;
+        double fare = inVoiceServicer.calculateTotalFare(distance, time);
+        Assert.assertEquals(40.0, fare, 0.0);
+    }
+
+    @Test
+    public void givenLessDistanceAndTimeForPremium_ShouldReturnMinimumFare() {
+        InVoiceService inVoiceServicer = new InVoiceService(CabSubscriptionsType.PREMIUM);
+        double distance = 0.1;
+        int time = 1;
+        double fare = inVoiceServicer.calculateTotalFare(distance, time);
+        Assert.assertEquals(20.0, fare, 0.0);
+    }
+
+    @Test
+    public void givenMultipleRidesForPremium_ShouldReturnInvoiceSummary() {
+        InVoiceService inVoiceService = new InVoiceService(CabSubscriptionsType.PREMIUM);
+        Ride[] rides = {new Ride(2.0, 5),
+                new Ride(0.1, 1),
+
+        };
+        InvoiceSummary summary = inVoiceService.calculateTotalFare(rides);
+        InvoiceSummary expectedInvoiceSummary = new InvoiceSummary(2, 60.0);
+        Assert.assertEquals(expectedInvoiceSummary, summary);
+    }
+
+    @Test
+    public void givenUserIdAndRidesForPremium_ShouldReturnInvoiceSummary() {
+        InVoiceService inVoiceService = new InVoiceService(CabSubscriptionsType.PREMIUM);
+        String userId = "a@b.com";
+        Ride[] rides = {new Ride(2.0, 5),
+                new Ride(0.1, 1)
+        };
+        inVoiceService.addRides(userId, rides);
+        InvoiceSummary summary = inVoiceService.getInvoiceSummmary(userId);
+        InvoiceSummary expectedInvoiceSummary = new InvoiceSummary(2, 60.0);
+        System.out.println(expectedInvoiceSummary);
         Assert.assertEquals(expectedInvoiceSummary, summary);
     }
 }