From fda101840ab4fa1b29431413702a42c27b678594 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Mon, 21 Dec 2020 10:17:17 +0300 Subject: [PATCH] fixed order isuues --- assets/images/pharmacy/arrow-left-png.png | Bin 0 -> 2208 bytes assets/images/pharmacy/arrow-left.png | Bin 0 -> 2208 bytes assets/images/pharmacy/arrow-right-png.png | Bin 0 -> 2214 bytes assets/images/pharmacy/arrow.png | Bin 0 -> 2214 bytes assets/images/pharmacy/arrow_lef.png | Bin 0 -> 2214 bytes assets/images/pharmacy/arrow_left.svg | 6 + assets/images/pharmacy/terms.png | Bin 0 -> 1782 bytes lib/config/localized_values.dart | 7 +- .../order_model_view_model.dart | 35 ++++-- lib/pages/pharmacy/order/Order.dart | 118 ++++++++++++------ lib/pages/pharmacy/order/OrderDetails.dart | 36 +++--- lib/pages/pharmacy/profile/profile.dart | 103 ++++++++++++++- lib/uitl/translations_delegate_base.dart | 5 + lib/widgets/pharmacy/product_tile.dart | 31 +++-- 14 files changed, 258 insertions(+), 83 deletions(-) create mode 100644 assets/images/pharmacy/arrow-left-png.png create mode 100644 assets/images/pharmacy/arrow-left.png create mode 100644 assets/images/pharmacy/arrow-right-png.png create mode 100644 assets/images/pharmacy/arrow.png create mode 100644 assets/images/pharmacy/arrow_lef.png create mode 100644 assets/images/pharmacy/arrow_left.svg create mode 100644 assets/images/pharmacy/terms.png diff --git a/assets/images/pharmacy/arrow-left-png.png b/assets/images/pharmacy/arrow-left-png.png new file mode 100644 index 0000000000000000000000000000000000000000..18d58c8789d9d62cf07226a8667a3040ca9dc413 GIT binary patch literal 2208 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 iH)cLYqehJym85^pV00xQrb2T70000j literal 0 HcmV?d00001 diff --git a/assets/images/pharmacy/arrow-left.png b/assets/images/pharmacy/arrow-left.png new file mode 100644 index 0000000000000000000000000000000000000000..18d58c8789d9d62cf07226a8667a3040ca9dc413 GIT binary patch literal 2208 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 iH)cLYqehJym85^pV00xQrb2T70000j literal 0 HcmV?d00001 diff --git a/assets/images/pharmacy/arrow-right-png.png b/assets/images/pharmacy/arrow-right-png.png new file mode 100644 index 0000000000000000000000000000000000000000..19af7c0bac23d17d77e5bd6d791c729609adba9b GIT binary patch literal 2214 zcmV;X2wC@uP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+SQj^lJYnVh2OP`SwiHS?B)2Ts@cITe~wHVXrO5b z|2#}m#KCbS>pSu#H2?Wq=`S3vq>Vz9oJvX?j!;5z6*qZ19jB7Fu&(O}`y>4SR!`># z4pkndKmAQ}Z(mU#FE7ac0=Mt=Bz?D&cSHMwFN5AZJKXH;@@~kxQ$6qhsqF97a23w} z)9%*e*iMgb{|5n#5n<0ea?`Wla82gLqX)kDiqhlCo}JY&?t_oGdY>P&qx0^Q$gntYiZP}rF~<^X@+qX4Qj%nIR245lq9hT?Qlw^|LykFR$vKx? ziz^;eSS+asm0U`x6;3NmSG--(qSoe`Z=uDOnzYA9C)hZ}xi_>VM% zMjmC<$rGtG!;CXcnR%936}hHfgGNm%nzd*>tG289T{XT@?zw8bt7eLY)lM#|p<3k2 z1lx2HO*1Iw0z+{z1(49rG}|(V;7mEwY%30fB08wX(Zm^Sib26J*+u2Eb{FNI>P9iV zrJMUnIWp<~gmPrk?aJNj_CU2!*NWnoKsE}E>E;y^8yd`9U9Pq!9WLop1HT(;HR~p# zy-n2>jcQ7G*xO(YqH`qm4MEQ+fZY(ihb+FR@Wi;0I59@C7(=DV5zu?eW@;25R9Njp zJ!I4^jh;NuDI+y3kXRP#>dHqYz19$&>^!VrPMZ~wuhfRjg7mC0E6rY3q&$Cy&Nj@y@8E2nk~gGqHQC5K?5H%0xiN0<= zEuR=-2nMgL7Kg~3e#Mb2G@cfSpM4KR9nCYY&uG!(tazUmU2uI?(kl&Lp+y&5pV6Y< z#?Y&@=uvVVDe1izex^l_lIsX9dOj3ir$x_);_D?H#d}MOo)5*>Y0;|_*Kf4w)rsqa z`RF}b^y$>rSo#?OH#yvb_I>MwVb9{v0rM~kY|Li*m5EK(XnTkF-@I*jM8z< zQqiM0?4#Ry`AJDXH;5}gvTf3arN`RbAQ9S1kS)zVAp`nj;Z!R7W@k?hJtv1h4W%Vn zEjMsa`C&N-C&&)u(eeR=NDO%3+06rhSmt3TW%ur2rhupG7Kd!XkmE?G0d_FA#H;Y zScKpEMy5aXk^LVTvJX}I7h!|UJ5_~sTL1t624YJ`L;wH)0002_L%V+f000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2jc?^2rVWsk+Amw00PEIL_t(|+U=UlZqq;%hQGwA zDzQVN7s{=o66gp-D<~V@VxDx~p`wDq5`@kMmIx%EnV|56t5 zSTpl~Gd^=p9B9?5RjXFz${5pKmbrFHHogk%0c$`Ce6rSlj~PJOEA;}n1)KvnfS1OY z?dt^K=G^yl;AzYd$_9`vxE3{pvH^VbT)%+uFg5^5nVqR>Dk2kL({szZh@7eFaU%gZ z2m=vG9fU=v%vwwkk}5h?)uD(Cf!nb|NUG{sRYwINoQ8&wRM~j}225sO0V~#-vP#$C%|J*a|V2A><+lZ zd7f#(#m)0?tUSRW!GQ9V7nXetdB}ZNAR(@LNoO(5ye}(^dz98mnONEUw zdpYJuF5uN}z7_z^yzl>kL$~r{0;v<&{9#D*l>%4>^OXTG#ykhMbIiXktDcVzfLr-{ zp601DKPD3ON;WUR9pKM`<_tKB$$S-gzyr_q%oR2%k*SV6AX@WP0QkI2=1VV!RrQyM ooB*r9SKvcz&wQ&^ty<0MFCu`1o^i+R`v3p{07*qoM6N<$f*QIMG5`Po literal 0 HcmV?d00001 diff --git a/assets/images/pharmacy/arrow.png b/assets/images/pharmacy/arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..19af7c0bac23d17d77e5bd6d791c729609adba9b GIT binary patch literal 2214 zcmV;X2wC@uP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+SQj^lJYnVh2OP`SwiHS?B)2Ts@cITe~wHVXrO5b z|2#}m#KCbS>pSu#H2?Wq=`S3vq>Vz9oJvX?j!;5z6*qZ19jB7Fu&(O}`y>4SR!`># z4pkndKmAQ}Z(mU#FE7ac0=Mt=Bz?D&cSHMwFN5AZJKXH;@@~kxQ$6qhsqF97a23w} z)9%*e*iMgb{|5n#5n<0ea?`Wla82gLqX)kDiqhlCo}JY&?t_oGdY>P&qx0^Q$gntYiZP}rF~<^X@+qX4Qj%nIR245lq9hT?Qlw^|LykFR$vKx? ziz^;eSS+asm0U`x6;3NmSG--(qSoe`Z=uDOnzYA9C)hZ}xi_>VM% zMjmC<$rGtG!;CXcnR%936}hHfgGNm%nzd*>tG289T{XT@?zw8bt7eLY)lM#|p<3k2 z1lx2HO*1Iw0z+{z1(49rG}|(V;7mEwY%30fB08wX(Zm^Sib26J*+u2Eb{FNI>P9iV zrJMUnIWp<~gmPrk?aJNj_CU2!*NWnoKsE}E>E;y^8yd`9U9Pq!9WLop1HT(;HR~p# zy-n2>jcQ7G*xO(YqH`qm4MEQ+fZY(ihb+FR@Wi;0I59@C7(=DV5zu?eW@;25R9Njp zJ!I4^jh;NuDI+y3kXRP#>dHqYz19$&>^!VrPMZ~wuhfRjg7mC0E6rY3q&$Cy&Nj@y@8E2nk~gGqHQC5K?5H%0xiN0<= zEuR=-2nMgL7Kg~3e#Mb2G@cfSpM4KR9nCYY&uG!(tazUmU2uI?(kl&Lp+y&5pV6Y< z#?Y&@=uvVVDe1izex^l_lIsX9dOj3ir$x_);_D?H#d}MOo)5*>Y0;|_*Kf4w)rsqa z`RF}b^y$>rSo#?OH#yvb_I>MwVb9{v0rM~kY|Li*m5EK(XnTkF-@I*jM8z< zQqiM0?4#Ry`AJDXH;5}gvTf3arN`RbAQ9S1kS)zVAp`nj;Z!R7W@k?hJtv1h4W%Vn zEjMsa`C&N-C&&)u(eeR=NDO%3+06rhSmt3TW%ur2rhupG7Kd!XkmE?G0d_FA#H;Y zScKpEMy5aXk^LVTvJX}I7h!|UJ5_~sTL1t624YJ`L;wH)0002_L%V+f000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2jc?^2rVWsk+Amw00PEIL_t(|+U=UlZqq;%hQGwA zDzQVN7s{=o66gp-D<~V@VxDx~p`wDq5`@kMmIx%EnV|56t5 zSTpl~Gd^=p9B9?5RjXFz${5pKmbrFHHogk%0c$`Ce6rSlj~PJOEA;}n1)KvnfS1OY z?dt^K=G^yl;AzYd$_9`vxE3{pvH^VbT)%+uFg5^5nVqR>Dk2kL({szZh@7eFaU%gZ z2m=vG9fU=v%vwwkk}5h?)uD(Cf!nb|NUG{sRYwINoQ8&wRM~j}225sO0V~#-vP#$C%|J*a|V2A><+lZ zd7f#(#m)0?tUSRW!GQ9V7nXetdB}ZNAR(@LNoO(5ye}(^dz98mnONEUw zdpYJuF5uN}z7_z^yzl>kL$~r{0;v<&{9#D*l>%4>^OXTG#ykhMbIiXktDcVzfLr-{ zp601DKPD3ON;WUR9pKM`<_tKB$$S-gzyr_q%oR2%k*SV6AX@WP0QkI2=1VV!RrQyM ooB*r9SKvcz&wQ&^ty<0MFCu`1o^i+R`v3p{07*qoM6N<$f*QIMG5`Po literal 0 HcmV?d00001 diff --git a/assets/images/pharmacy/arrow_lef.png b/assets/images/pharmacy/arrow_lef.png new file mode 100644 index 0000000000000000000000000000000000000000..19af7c0bac23d17d77e5bd6d791c729609adba9b GIT binary patch literal 2214 zcmV;X2wC@uP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+SQj^lJYnVh2OP`SwiHS?B)2Ts@cITe~wHVXrO5b z|2#}m#KCbS>pSu#H2?Wq=`S3vq>Vz9oJvX?j!;5z6*qZ19jB7Fu&(O}`y>4SR!`># z4pkndKmAQ}Z(mU#FE7ac0=Mt=Bz?D&cSHMwFN5AZJKXH;@@~kxQ$6qhsqF97a23w} z)9%*e*iMgb{|5n#5n<0ea?`Wla82gLqX)kDiqhlCo}JY&?t_oGdY>P&qx0^Q$gntYiZP}rF~<^X@+qX4Qj%nIR245lq9hT?Qlw^|LykFR$vKx? ziz^;eSS+asm0U`x6;3NmSG--(qSoe`Z=uDOnzYA9C)hZ}xi_>VM% zMjmC<$rGtG!;CXcnR%936}hHfgGNm%nzd*>tG289T{XT@?zw8bt7eLY)lM#|p<3k2 z1lx2HO*1Iw0z+{z1(49rG}|(V;7mEwY%30fB08wX(Zm^Sib26J*+u2Eb{FNI>P9iV zrJMUnIWp<~gmPrk?aJNj_CU2!*NWnoKsE}E>E;y^8yd`9U9Pq!9WLop1HT(;HR~p# zy-n2>jcQ7G*xO(YqH`qm4MEQ+fZY(ihb+FR@Wi;0I59@C7(=DV5zu?eW@;25R9Njp zJ!I4^jh;NuDI+y3kXRP#>dHqYz19$&>^!VrPMZ~wuhfRjg7mC0E6rY3q&$Cy&Nj@y@8E2nk~gGqHQC5K?5H%0xiN0<= zEuR=-2nMgL7Kg~3e#Mb2G@cfSpM4KR9nCYY&uG!(tazUmU2uI?(kl&Lp+y&5pV6Y< z#?Y&@=uvVVDe1izex^l_lIsX9dOj3ir$x_);_D?H#d}MOo)5*>Y0;|_*Kf4w)rsqa z`RF}b^y$>rSo#?OH#yvb_I>MwVb9{v0rM~kY|Li*m5EK(XnTkF-@I*jM8z< zQqiM0?4#Ry`AJDXH;5}gvTf3arN`RbAQ9S1kS)zVAp`nj;Z!R7W@k?hJtv1h4W%Vn zEjMsa`C&N-C&&)u(eeR=NDO%3+06rhSmt3TW%ur2rhupG7Kd!XkmE?G0d_FA#H;Y zScKpEMy5aXk^LVTvJX}I7h!|UJ5_~sTL1t624YJ`L;wH)0002_L%V+f000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2jc?^2rVWsk+Amw00PEIL_t(|+U=UlZqq;%hQGwA zDzQVN7s{=o66gp-D<~V@VxDx~p`wDq5`@kMmIx%EnV|56t5 zSTpl~Gd^=p9B9?5RjXFz${5pKmbrFHHogk%0c$`Ce6rSlj~PJOEA;}n1)KvnfS1OY z?dt^K=G^yl;AzYd$_9`vxE3{pvH^VbT)%+uFg5^5nVqR>Dk2kL({szZh@7eFaU%gZ z2m=vG9fU=v%vwwkk}5h?)uD(Cf!nb|NUG{sRYwINoQ8&wRM~j}225sO0V~#-vP#$C%|J*a|V2A><+lZ zd7f#(#m)0?tUSRW!GQ9V7nXetdB}ZNAR(@LNoO(5ye}(^dz98mnONEUw zdpYJuF5uN}z7_z^yzl>kL$~r{0;v<&{9#D*l>%4>^OXTG#ykhMbIiXktDcVzfLr-{ zp601DKPD3ON;WUR9pKM`<_tKB$$S-gzyr_q%oR2%k*SV6AX@WP0QkI2=1VV!RrQyM ooB*r9SKvcz&wQ&^ty<0MFCu`1o^i+R`v3p{07*qoM6N<$f*QIMG5`Po literal 0 HcmV?d00001 diff --git a/assets/images/pharmacy/arrow_left.svg b/assets/images/pharmacy/arrow_left.svg new file mode 100644 index 00000000..00fa7556 --- /dev/null +++ b/assets/images/pharmacy/arrow_left.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/pharmacy/terms.png b/assets/images/pharmacy/terms.png new file mode 100644 index 0000000000000000000000000000000000000000..76cfacab5761812815688012dadd0001543f321c GIT binary patch literal 1782 zcmb`I=Rezv0>*!d#4(zxRm6%BajYte5Sq63MeH=y5arrLuXS82aw@9jq(=Lx)jHJ* zTH3@ZYE)2^+M`BAj}fz48m=I&>yNlEp6C1S`{H@?WV^ZA!^GfX006)o9c(;K>2?}- z5#iIebx{*J1t`|T{wh#6q_hqI!fzaHu6X?h+A4GLSTdLCbqwZD$48H>K$>2XI7QNN zD-h)bcI7x~Ee32PZk^!bYPbM-tnBSJxd17cL$obbh#j6JI))J{gRWXE~hX zGbC?wye+(~p*5^j!asTYQpY?RgTW-blwANf)z?cu{KO?!HPPBa^GppS>;hMJc5a_6 zFF!Z?-WLc8l51;kzl=rh-PSFJCffvy6I0Sl4Zg$95#Q1toSZ$Up>fvrCYwflj@Jy` z)}>yS6ddw%{FQVY>2$i~@brtUr_eRY_|(D=1|wJG98z=!zX)G*lfC8!ON&Xrz>jTa zv3~Bo3sn+z>#($kGApF05h}{cWfp%7=7f{Uug`{*OcN0;6#kUB&`jc0=BD1jji@pQq?y*^Gnue<3nP-?Yx0H_dQi1AFx zuwM=-PDf4Rllq*_pwTh~^VIqd(+V~0{Lqz_aCl%eUNv6aENay~_)8xyKOIIiOKpOP^7nbED%Pt?p*WFVV(?8N#nc+@vW1m6+wKpo8hG=q-~G8Y>tYV5U~3dQ zVPbO(JuvUeC3yzQ4VlwMoacw2Kk|vMXNVR*z^I_muZ@ho#K)6mxIiVSNaJhE`Ajh(QjW)!o6HORv zbQ)uMK^i-nqOZq(mXR+I1&~Hh4uKKr!l3hjQxIkkRF2Z_(*p`W{a-qGCA;cfioG}1->^njKIm2QtfA8fD3~5jWn)- zO(t9eLb1lSypUd}uUw0~4<^)7g4r!)-`z+WZ06xRift{#X#uOSV~k5GpyHyoe*ZOs z^OtA$^Jkk#W7c@$!XMV3Ytpz?*7bnA~Rtd6c2)4-=tRp1v10EG}*B`@RToQ)!8|o$6TYdVF&-$ryY< zq%>QXd!#Xcrbw#(kZFyLk?+)yE^!w|kl}{>n!ndIeV!gq9Ar8$**lhScu6i&@u;VG zy>nJRk$ZL-XE7{;LS5$z_FEG}G=3UwQ`iSErZXg*B=9>=;jCdib8@{CLN0MHN(|-> zG%#~R-Go&L4qwm3+99&Hoe()mo-;A$78#fKl@E)&s;iE`t0f6SA`(`wb@nil2yr-6 z61q?7#AP&uS>7)RSIw%?0wY;pwv{lmbV!xBO=u&6C-$xZR49lH4oONnxZ3PdC(Rp? zobBrBvS(NSnf6__gPuO}3Es*4b5p$Dw{i3)=_bHWCH0o z^McV6S*b!+F9X-h2xJPzH&+(s1K7`_|556WoZXd<3SS7$a9utb7V805&4fPqIK`yr zIHbB}j9aHH**Err8DDtnl*6FP6u+L5d+<7vEIy_SDnNTU6-T4t$F*({vVFOgcR>z|q##rtT_<`achOH?sf$ literal 0 HcmV?d00001 diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index c52739f2..b60a0f45 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -654,9 +654,12 @@ const Map localizedValues = { "writeReview": {"en": "Write Review", "ar": " اكتب تقييمك"}, "shareReview": {"en": "SHARE REVIEW", "ar": " اكتب تقييمك"}, "review": {"en": " reviews", "ar": " تقييمات"}, + "pendingOrder": {"en": " PENDING", "ar": " معلقة"}, "deliveredOrder": {"en": " DELIVERED", "ar": " تم التوصيل"}, + "processingOrder": {"en": " PROCESSING", "ar": "قيد التنفيذ"}, + "cancelledOrder": {"en": " CANCELLED", "ar": "ملغي"}, "compare": {"en": " Compare", "ar": "مقارنه"}, - "medicationsRefill": {"en": " Medication Refill", "ar": "اعادة تعبئة الدواء"}, + "medicationsRefill": {"en": " Medication Refill", "ar": "طلب أعادة صرف"}, "myPrescription": {"en": " My Prescriptions", "ar": "وصفاتي"}, "quantity": {"en": " QTY ", "ar": "الكمية"}, "backMyAccount": { @@ -683,6 +686,8 @@ const Map localizedValues = { "cancelOrder": {"en": "CANCEL ORDER", "ar": "الغاء الطلب "}, "confirmAddress": {"en": "CONFIRM ADDRESS ", "ar": " تأكيد العنوان "}, "confirmLocation": {"en": "CONFIRM LOCATION ", "ar": " تأكيد الموقع "}, + "conditionsHMG": {"en": "Terms & Conditions ", "ar": "الشروط و الأحكام "}, + "conditions": {"en": "Terms & Conditions of Lakum", "ar": "شروط و احكام لكم"}, "confirmDeleteMsg": { "en": "Are you sure! want to delete ", "ar": "هل انت متأكد تريد الحذف " diff --git a/lib/core/viewModels/pharmacyModule/order_model_view_model.dart b/lib/core/viewModels/pharmacyModule/order_model_view_model.dart index f3262ba3..3ee6d0cf 100644 --- a/lib/core/viewModels/pharmacyModule/order_model_view_model.dart +++ b/lib/core/viewModels/pharmacyModule/order_model_view_model.dart @@ -1,5 +1,10 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart'; +import 'package:diplomaticquarterapp/core/model/pharmacies/LacumAccountInformation.dart'; +import 'package:diplomaticquarterapp/core/model/pharmacies/ShoppingCartResponse.dart'; +import 'package:diplomaticquarterapp/core/model/pharmacies/payment-checkout-data.dart'; +import 'package:diplomaticquarterapp/core/service/parmacyModule/order-preview-service.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/order/Order.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/order/OrderDetails.dart'; import 'package:diplomaticquarterapp/services/pharmacy_services/cancelOrder_service.dart'; @@ -23,6 +28,14 @@ class OrderModelViewModel extends BaseViewModel { List get cancelOrder => _cancelOrderService.cancelOrderList; + OrderPreviewService _orderServices = locator(); + List get addresses => _orderServices.addresses; + LacumAccountInformation get lacumInformation => + _orderServices.lacumInformation; + ShoppingCartResponse cartResponse = ShoppingCartResponse(); + PaymentCheckoutData paymentCheckoutData = PaymentCheckoutData(); + double totalAdditionalShippingCharge = 0; + Future getOrder(customerId, pageID) async { @@ -50,17 +63,6 @@ class OrderModelViewModel extends BaseViewModel { } } - Future getProductReview() async { - setState(ViewState.Busy); - await _orderService.getProductReview(); - if (_orderService.hasError) { - error = _orderService.error; - setState(ViewState.Error); - } else { - //order = _orderService.orderList; - setState(ViewState.Idle); - } - } Future getCanceledOrder(order, context) async { print("this is order id"+ order); @@ -89,4 +91,15 @@ class OrderModelViewModel extends BaseViewModel { } + Future makeOrder() async { + setState(ViewState.Busy); + await _orderServices.makeOrder(paymentCheckoutData, cartResponse.shoppingCarts); + if (_orderServices.hasError) { + error = _orderServices.error; + setState(ViewState.Error); + } else { + setState(ViewState.Idle); + } + } + } \ No newline at end of file diff --git a/lib/pages/pharmacy/order/Order.dart b/lib/pages/pharmacy/order/Order.dart index f153dd35..576bf2a0 100644 --- a/lib/pages/pharmacy/order/Order.dart +++ b/lib/pages/pharmacy/order/Order.dart @@ -1,6 +1,5 @@ import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_view_model.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; -import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; @@ -11,12 +10,13 @@ import 'package:diplomaticquarterapp/services/pharmacy_services/order_service.da import 'package:diplomaticquarterapp/pages/pharmacy/order/OrderDetails.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/order_model.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/pages/base/base_view.dart'; - +dynamic languageID; class OrderPage extends StatefulWidget { // orderList({this.customerId, this.pageId}); - var languageID ; + String customerID; OrderPage({@required this.customerID}); @@ -38,9 +38,9 @@ class _OrderPageState extends State with SingleTickerProviderStateMix List pendingOrderList = []; TabController _tabController; - AppSharedPreferences sharedPref = AppSharedPreferences(); +// AppSharedPreferences sharedPref = AppSharedPreferences(); getLanguageID() async { - return await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar'); + languageID = await sharedPref.getString(APP_LANGUAGE); } @override @@ -48,6 +48,7 @@ class _OrderPageState extends State with SingleTickerProviderStateMix getLanguageID(); super.initState(); + _tabController = new TabController(length: 4, vsync: this,); } @@ -179,7 +180,9 @@ class _OrderPageState extends State with SingleTickerProviderStateMix MaterialPageRoute(builder: (context) => OrderDetailsPage(orderModel:deliveredOrderList[index]))); }, child: SvgPicture.asset( - 'assets/images/pharmacy/arrow_right.svg', + languageID == "ar" + ? 'assets/images/pharmacy/arrow_left.svg' + :'assets/images/pharmacy/arrow_right.svg', height: 20, width: 20,), ), @@ -219,7 +222,9 @@ class _OrderPageState extends State with SingleTickerProviderStateMix ), ) : Text( - deliveredOrderList[index].orderStatus.toString().substring(12), + languageID == "ar" + ? deliveredOrderList[index].orderStatusn.toString(): + deliveredOrderList[index].orderStatus.toString(), style: TextStyle( color: Colors.white, fontSize: 15.0, @@ -388,7 +393,9 @@ class _OrderPageState extends State with SingleTickerProviderStateMix MaterialPageRoute(builder: (context) => OrderDetailsPage(orderModel:processingOrderList[index]))); }, child: SvgPicture.asset( - 'assets/images/pharmacy/arrow_right.svg', + languageID == "ar" + ? 'assets/images/pharmacy/arrow_left.svg' + :'assets/images/pharmacy/arrow_right.svg', height: 20, width: 20,), ), @@ -417,14 +424,26 @@ class _OrderPageState extends State with SingleTickerProviderStateMix color: Colors.green, borderRadius: BorderRadius.circular(30.0) ), - child: Text( - processingOrderList[index].orderStatus.toString().substring(12), - style: TextStyle( - color: Colors.white, - fontSize: 15.0, - fontWeight: FontWeight.bold, - ), - ), + child: processingOrderList[index].orderStatusId == 20 + ? Text( +// deliveredOrderList[0].orderStatus.toString().substring(12), + TranslationBase.of(context).processingOrder, + style: TextStyle( + color: Colors.white, + fontSize: 15.0, + fontWeight: FontWeight.bold, + ), + ) + : Text( + languageID == "ar" + ? processingOrderList[index].orderStatusn.toString(): + processingOrderList[index].orderStatus.toString(), + style: TextStyle( + color: Colors.white, + fontSize: 15.0, + fontWeight: FontWeight.bold, + ), + ) ), Container( margin: EdgeInsets.only(left: 8, right: 8, top: 1, bottom: 8), @@ -765,7 +784,9 @@ class _OrderPageState extends State with SingleTickerProviderStateMix MaterialPageRoute(builder: (context) => OrderDetailsPage(orderModel:pendingOrderList[index]))); }, child: SvgPicture.asset( - 'assets/images/pharmacy/arrow_right.svg', + languageID == "ar" + ? 'assets/images/pharmacy/arrow_left.svg' + :'assets/images/pharmacy/arrow_right.svg', height: 20, width: 20,), ), @@ -794,16 +815,26 @@ class _OrderPageState extends State with SingleTickerProviderStateMix color: Colors.orange[300], borderRadius: BorderRadius.circular(30.0) ), - child: Text( - widget.languageID == "ar" - ? pendingOrderList[index].orderStatusn.toString() - : pendingOrderList[index].orderStatus.toString().substring(12), - style: TextStyle( - color: Colors.white, - fontSize: 15.0, - fontWeight: FontWeight.bold, - ), - ), + child: pendingOrderList[index].orderStatusId == 10 + ? Text( +// deliveredOrderList[0].orderStatus.toString().substring(12), + TranslationBase.of(context).pendingOrder, + style: TextStyle( + color: Colors.white, + fontSize: 15.0, + fontWeight: FontWeight.bold, + ), + ) + : Text( + languageID == "ar" + ? pendingOrderList[index].orderStatusn.toString(): + pendingOrderList[index].orderStatus.toString(), + style: TextStyle( + color: Colors.white, + fontSize: 15.0, + fontWeight: FontWeight.bold, + ), + ) ), Container( margin: EdgeInsets.all(8.0), @@ -969,7 +1000,9 @@ class _OrderPageState extends State with SingleTickerProviderStateMix MaterialPageRoute(builder: (context) => OrderDetailsPage(orderModel:cancelledOrderList[index]))); }, child: SvgPicture.asset( - 'assets/images/pharmacy/arrow_right.svg', + languageID == "ar" + ? 'assets/images/pharmacy/arrow_left.svg' + :'assets/images/pharmacy/arrow_right.svg', height: 20, width: 20,), ), @@ -998,15 +1031,26 @@ class _OrderPageState extends State with SingleTickerProviderStateMix color: Colors.red[900], borderRadius: BorderRadius.circular(30.0) ), - child: Text( widget.languageID == "ar" - ? cancelledOrderList[index].orderStatusn.toString() - : cancelledOrderList[index].orderStatus.toString().substring(12), - style: TextStyle( - color: Colors.white, - fontSize: 15.0, - fontWeight: FontWeight.bold, - ), - ), + child: cancelledOrderList[index].orderStatusId == 40 + ? Text( +// deliveredOrderList[0].orderStatus.toString().substring(12), + TranslationBase.of(context).cancelledOrder, + style: TextStyle( + color: Colors.white, + fontSize: 15.0, + fontWeight: FontWeight.bold, + ), + ) + : Text( + languageID == "ar" + ? cancelledOrderList[index].orderStatusn.toString(): + cancelledOrderList[index].orderStatus.toString(), + style: TextStyle( + color: Colors.white, + fontSize: 15.0, + fontWeight: FontWeight.bold, + ), + ) ), Container( margin: EdgeInsets.only(left: 8, right: 8, top: 1, bottom: 8), diff --git a/lib/pages/pharmacy/order/OrderDetails.dart b/lib/pages/pharmacy/order/OrderDetails.dart index 57cddeca..b7d92543 100644 --- a/lib/pages/pharmacy/order/OrderDetails.dart +++ b/lib/pages/pharmacy/order/OrderDetails.dart @@ -2,11 +2,11 @@ import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/order/Order.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; -import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:diplomaticquarterapp/widgets//pharmacy/product_tile.dart'; import 'package:diplomaticquarterapp/config/config.dart'; @@ -16,15 +16,14 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/order_model.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; +import 'package:provider/provider.dart'; - +dynamic languageID; class OrderDetailsPage extends StatefulWidget { - var languageID ; - OrderModel orderModel; OrderDetailsPage({ @required this.orderModel @@ -37,12 +36,11 @@ class OrderDetailsPage extends StatefulWidget { class _OrderDetailsPageState extends State { getLanguageID() async { - return await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar'); + languageID = await sharedPref.getString(APP_LANGUAGE); } - AppSharedPreferences sharedPref = AppSharedPreferences(); +// AppSharedPreferences sharedPref = AppSharedPreferences(); String orderId=""; - String customerId; List orderList = [] ; List cancelledOrderList = []; @@ -56,9 +54,9 @@ class _OrderDetailsPageState extends State { @override void initState() { + getLanguageID(); super.initState(); print(widget.orderModel.orderItems.length); - getLanguageID(); getCancelOrder(widget.orderModel.id); // cancelOrderDetail(order) } @@ -109,9 +107,9 @@ class _OrderDetailsPageState extends State { ), child: Text( // widget.orderModel.orderStatus.toString().substring(12), - widget.languageID == "ar" - ? widget.orderModel.orderStatusn.toString() - : widget.orderModel.orderStatus.toString().substring(12) , +// languageID == "ar" +// ? widget.orderModel.orderStatusn.toString(): + widget.orderModel.orderStatus.toString().substring(12) , // TranslationBase.of(context).delivered, style: TextStyle( color: Colors.white, @@ -140,7 +138,7 @@ class _OrderDetailsPageState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text(widget.orderModel.shippingAddress.address1.toString().substring(9), - style: TextStyle(fontSize: 11.0, fontWeight: FontWeight.bold, + style: TextStyle(fontSize: 10.0, fontWeight: FontWeight.bold, color: Colors.grey, ), ), @@ -289,7 +287,10 @@ class _OrderDetailsPageState extends State { totalPrice: "${(widget.orderModel.orderItems[index].product.price * widget.orderModel.orderItems[index].quantity).toStringAsFixed(2)}", qyt: widget.orderModel.orderItems[index].quantity.toString(), - img:widget.orderModel.orderItems[index].product.images[0].src.toString(), + imgs: widget.orderModel.orderItems[index].product.images != null && + widget.orderModel.orderItems[index].product.images.length != 0 + ? widget.orderModel.orderItems[index].product.images [0].src.toString() + : null, status: widget.orderModel.orderStatusId,), ); } @@ -444,20 +445,19 @@ class _OrderDetailsPageState extends State { ), widget.orderModel.orderStatusId == 10 ? InkWell( onTap: () { -// Navigator.push(context, -// MaterialPageRoute(builder: (context) => InAppBrowser())); + model.makeOrder(); }, child: Container( // margin: EdgeInsets.only(top: 20.0), height: 50.0, color: Colors.transparent, child: Container( - padding: EdgeInsets.only(left: 150.0, right: 150.0), + padding: EdgeInsets.only(left: 130.0, right: 130.0), decoration: BoxDecoration( border: Border.all( color: Colors.green, style: BorderStyle.solid, - width: 1.0 + width: 4.0 ), color: Colors.green, borderRadius: BorderRadius.circular(5.0) @@ -584,9 +584,9 @@ class _OrderDetailsPageState extends State { } } +} -} diff --git a/lib/pages/pharmacy/profile/profile.dart b/lib/pages/pharmacy/profile/profile.dart index e52d059b..eccf9e6a 100644 --- a/lib/pages/pharmacy/profile/profile.dart +++ b/lib/pages/pharmacy/profile/profile.dart @@ -3,35 +3,45 @@ import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.da import 'package:diplomaticquarterapp/pages/ContactUs/LiveChat/livechat_page.dart'; import 'package:diplomaticquarterapp/pages/ContactUs/findus/findus_page.dart'; import 'package:diplomaticquarterapp/pages/DrawerPages/family/my-family.dart'; +import 'package:diplomaticquarterapp/pages/login/welcome.dart'; import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/lakum-main-page.dart'; +import 'package:diplomaticquarterapp/pages/pharmacies/screens/lakum-terms-conditions-page.dart'; +import 'package:diplomaticquarterapp/pages/pharmacies/screens/pharmacy-terms-conditions-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/wishlist.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/order/Order.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart'; -import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import 'package:diplomaticquarterapp/pages/base/base_view.dart'; + +dynamic languageID ; class PharmacyProfilePage extends StatefulWidget { @override _ProfilePageState createState() => _ProfilePageState(); } class _ProfilePageState extends State { - AppSharedPreferences sharedPref = AppSharedPreferences(); + AuthenticatedUser user; bool isLogin = false; String firstName; String customerId; + String lastName, mobileNo, identificationNo; + int languageId; + _ProfilePageState({this.customerId}); + getLanguageID() async { + languageID = await sharedPref.getString(APP_LANGUAGE); + } getCustomer() async { String custID; custID = await sharedPref.getString(PHARMACY_CUSTOMER_ID); - setState(() { customerId = custID; }); @@ -41,15 +51,26 @@ class _ProfilePageState extends State { getUser() async { var userData = await sharedPref.getObject(USER_PROFILE); - if (userData != null) user = AuthenticatedUser.fromJson(userData); + if (userData != null){ user = AuthenticatedUser.fromJson(userData); setState(() { firstName = user.firstName.toString(); print("this is user" + user.firstName.toString()); + print("this is user" + user.firstNameN.toString()); }); -// this.isLogin = user != null; + } else{ + if(userData == null){ + Navigator.push(context, + MaterialPageRoute(builder: (context) => + WelcomeLogin()), + ); + } + } + +// this.isLogin = user != null; } void initState() { getCustomer(); + getLanguageID(); super.initState(); getUser(); } @@ -97,7 +118,9 @@ class _ProfilePageState extends State { color: Colors.grey), ), Text( - user.firstName.toString()+ " " + user.lastName.toString(), + languageID == "ar" + ? user.firstNameN.toString()+ " " + user.lastNameN.toString() + : user.firstName.toString()+ " " + user.lastName.toString(), style: TextStyle( fontSize: 14.0, fontWeight: FontWeight.bold), ), @@ -417,6 +440,74 @@ class _ProfilePageState extends State { ], ), ), + SizedBox( + height: 5, + ), + Divider( + color: Colors.grey, + height: 20, + ), + InkWell( + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => PharmacyTermsConditions())); + }, + child: Row( + children: [ + Image.asset('assets/images/pharmacy/terms.png', + width: 25, + height: 25, + ), + + SizedBox( + width: 10, + ), + Text( + TranslationBase.of(context).conditionsHMG, + style: TextStyle( + fontSize: 13.0, + ), + ), + ], + ), + ), + SizedBox( + height: 5, + ), + Divider( + color: Colors.grey, + height: 20, + ), + InkWell( + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => LakumTermsConditions(this.identificationNo, this.firstName, this.lastName, + this.mobileNo, this.languageId))); + }, + child: Row( + children: [ + Image.asset('assets/images/pharmacy/terms.png', + width: 25, + height: 25, + ), +// IconButton(icon: Icon(Icons.error_outline), iconSize: 30, +// color: Colors.black,), + SizedBox( + width: 10, + ), + Text( + TranslationBase.of(context).conditions, + style: TextStyle( + fontSize: 13.0, + ), + ), + ], + ), + ), ], ), ), diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index d10cb542..f60d010f 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -770,10 +770,15 @@ class TranslationBase { String get noOrder => localizedValues['noOrder'][locale.languageCode]; String get review => localizedValues['review'][locale.languageCode]; String get deliveredOrder => localizedValues['deliveredOrder'][locale.languageCode]; + String get pendingOrder => localizedValues['pendingOrder'][locale.languageCode]; + String get processingOrder => localizedValues['processingOrder'][locale.languageCode]; + String get cancelledOrder => localizedValues['cancelledOrder'][locale.languageCode]; String get compare => localizedValues['compare'][locale.languageCode]; String get medicationsRefill => localizedValues['medicationsRefill'][locale.languageCode]; String get myPrescription => localizedValues['myPrescription'][locale.languageCode]; String get quantity => localizedValues['quantity'][locale.languageCode]; + String get conditionsHMG => localizedValues['conditionsHMG'][locale.languageCode]; + String get conditions => localizedValues['conditions'][locale.languageCode]; // pharmacy module diff --git a/lib/widgets/pharmacy/product_tile.dart b/lib/widgets/pharmacy/product_tile.dart index b56fc625..bdb45cb3 100644 --- a/lib/widgets/pharmacy/product_tile.dart +++ b/lib/widgets/pharmacy/product_tile.dart @@ -1,14 +1,14 @@ -import 'package:diplomaticquarterapp/pages/pharmacy/order/ProductReview.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_html/style.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:rating_bar/rating_bar.dart'; -import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/pages/pharmacy/order/ProductReview.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:rating_bar/rating_bar.dart'; + class productTile extends StatelessWidget { final String productName; final String productPrice; @@ -18,12 +18,13 @@ class productTile extends StatelessWidget { final String totalPrice; final bool isOrderDetails; final String img; + final String imgs; final int status; productTile({this.productName, this.productPrice, this.productRate, this.qyt, this.totalPrice, this.productReviews, this.img, - this.isOrderDetails=true, this.status}); + this.isOrderDetails=true, this.status, this.imgs}); @override @@ -38,13 +39,23 @@ class productTile extends StatelessWidget { children: [ Row( children: [ - Container( + this.imgs != null && this.imgs.length > 0 + ? Container( margin: EdgeInsets.only(left: 10), - child: Image.network(img), + child: Image.network(imgs), // fit: BoxFit.cover, width: 80, height: 80, - ), + ) + : Container( + margin: EdgeInsets.only(left: 10), + child: Image.asset( + "assets/images/no_image.png", + width: 80, + height: 80, + ) +// fit: BoxFit.cover, + ), Expanded( flex: 5, child: Column(