created order and order details UI pages

merge-requests/206/head
Fatimah Alshammari 4 years ago
parent 1e00b9a4d8
commit f137bd44c0

@ -25,6 +25,8 @@
android:icon="@mipmap/ic_launcher"
android:usesCleartextTraffic="true"
android:label="diplomaticquarterapp">
<meta-data android:name="com.google.android.geo.API_KEY"
android:value="AIzaSyCyDbWUM9d_sBUGIE8PcuShzPaqO08NSC8"/>
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@ -72,8 +74,8 @@
android:name="flutterEmbedding"
android:value="2" />
<meta-data android:name="com.google.android.geo.API_KEY"
android:value="AIzaSyCiD4YqVqLNYbt8-htvFy4Wp8XSph9E3wM"/>
<!-- <meta-data android:name="com.google.android.geo.API_KEY"-->
<!-- android:value="AIzaSyCiD4YqVqLNYbt8-htvFy4Wp8XSph9E3wM"/>-->
</application>

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 44 KiB

@ -0,0 +1,17 @@
<svg xmlns="http://www.w3.org/2000/svg" width="95.266" height="25.878" viewBox="0 0 95.266 25.878">
<g id="Group_1207" data-name="Group 1207" transform="translate(-114.266 -194)">
<g id="Path_1368" data-name="Path 1368" transform="translate(114.266 194)" fill="#fff">
<path d="M 92.51264953613281 25.37797546386719 L 2.752974987030029 25.37797546386719 C 1.510674953460693 25.37797546386719 0.5 24.36730003356934 0.5 23.125 L 0.5 2.752975225448608 C 0.5 1.510675191879272 1.510674953460693 0.5000002384185791 2.752974987030029 0.5000002384185791 L 92.51264953613281 0.5000002384185791 C 93.75495147705078 0.5000002384185791 94.765625 1.510675191879272 94.765625 2.752975225448608 L 94.765625 23.125 C 94.765625 24.36730003356934 93.75495147705078 25.37797546386719 92.51264953613281 25.37797546386719 Z" stroke="none"/>
<path d="M 2.752975463867188 1 C 1.786384582519531 1 1 1.786388397216797 1 2.752975463867188 L 1 23.125 C 1 24.09158706665039 1.786384582519531 24.87797546386719 2.752975463867188 24.87797546386719 L 92.51264953613281 24.87797546386719 C 93.47924041748047 24.87797546386719 94.265625 24.09158706665039 94.265625 23.125 L 94.265625 2.752975463867188 C 94.265625 1.786388397216797 93.47924041748047 1 92.51264953613281 1 L 2.752975463867188 1 M 2.752975463867188 0 L 92.51264953613281 0 C 94.03307342529297 0 95.265625 1.232549667358398 95.265625 2.752975463867188 L 95.265625 23.125 C 95.265625 24.64542579650879 94.03307342529297 25.87797546386719 92.51264953613281 25.87797546386719 L 2.752975463867188 25.87797546386719 C 1.232551574707031 25.87797546386719 0 24.64542579650879 0 23.125 L 0 2.752975463867188 C 0 1.232549667358398 1.232551574707031 0 2.752975463867188 0 Z" stroke="none" fill="#ccc"/>
</g>
<g id="Group_417" data-name="Group 417" transform="translate(-1932.136 317)">
<g id="Group_22" data-name="Group 22" transform="translate(2052 -119)">
<path id="Path_19" data-name="Path 19" d="M497.257,14.133s.591,0,1.007,0l3.154.015c.376,0,.69-.4.708-.978l0-2.636c0-.562.252-1,.641-1.027l.967-.008c.39.024.658.468.658,1.027l0,2.651c.018.578.28.955.659.955l4.246.011.008-3.258c0-.56-.269-1-.66-1.02l-1.706-.008c-.378,0-.674-.4-.691-.977l-.007-.881c.019-.578.317-.976.7-.976l1.716.005c.39-.026.644-.486.644-1.045l0-4.066a1.73,1.73,0,0,1-1.314.821H505.1c-.376,0-.69.41-.708.988V6.333c-.018.578-.313.985-.69.985l-.873-.007c-.379,0-.681-.4-.7-.97l0-2.64c-.018-.578-.317-.967-.694-.967h-4.188V5.982c0,.562.263,1.009.654,1.036l1.716-.007c.388.026.663.488.663,1.046l-.005.752c0,.56-.265,1.009-.655,1.035l-1.718,0c-.391.027-.654.471-.654,1.03ZM511.678,1.685V15.267a1.727,1.727,0,0,1-1.745,1.643h-13.4a1.719,1.719,0,0,1-1.737-1.644V1.659A1.728,1.728,0,0,1,496.53.01l13.393.005A1.757,1.757,0,0,1,511.678,1.685Z" transform="translate(-427.842 -0.01)" fill="#ed1c2b"/>
<path id="Path_20" data-name="Path 20" d="M80.948,99.367h-.175v-.325a.784.784,0,0,1-.713.382c-.789,0-.79-.534-.79-.752V97.555h.176v1.11c0,.357.124.6.62.6a.64.64,0,0,0,.708-.649V97.556h.175ZM77.986,97.5a.963.963,0,1,1-.97.963A.932.932,0,0,1,77.986,97.5Zm0,1.76a.8.8,0,1,0-.8-.8A.762.762,0,0,0,77.986,99.26Zm-2.1-1.7h.176v.379a.723.723,0,0,1,.7-.434.37.37,0,0,1,.129.023l.008.188a.437.437,0,0,0-.187-.026.648.648,0,0,0-.648.7v.98h-.176Zm-.58.357c-.009-.05-.009-.356-.009-.356h.176v1.713c0,.414-.142.867-.942.867-.528,0-.832-.166-.889-.612l.175-.014c.038.287.223.463.716.463.652,0,.766-.371.766-.7v-.327a.938.938,0,1,1-.786-1.449A.825.825,0,0,1,75.3,97.912Zm-1.559.494a.7.7,0,0,0,.778.778.713.713,0,0,0,.77-.782.775.775,0,0,0-1.548,0Zm-1.48-1.556h.173v2.518h-.173Zm-2.069,1.281c.058-.472.285-.632.8-.632.5,0,.789.123.789.536v1c0,.137,0,.2.1.2a.435.435,0,0,0,.146-.027l.014.16a.531.531,0,0,1-.2.031.177.177,0,0,1-.192-.114.461.461,0,0,1-.024-.127c0-.037,0-.076,0-.12a.9.9,0,0,1-.8.383,1.254,1.254,0,0,1-.17-.009.748.748,0,0,1-.235-.061.487.487,0,0,1-.3-.487c0-.378.306-.5.651-.526l.593-.042c.173-.014.249-.032.249-.242,0-.231-.12-.394-.62-.394-.442,0-.576.143-.621.459Zm1.417.25a.512.512,0,0,1-.267.08l-.575.042c-.284.022-.476.1-.476.363,0,.35.334.392.541.392.34,0,.775-.161.775-.575v-.3Zm-1.905-.241a.666.666,0,0,0-.71-.478.8.8,0,0,0,0,1.6.694.694,0,0,0,.732-.532l.177-.009a.852.852,0,0,1-.909.7A.962.962,0,1,1,69,97.5a.805.805,0,0,1,.884.631Zm-2.182-.586H67.7v1.812h-.175Zm-.583.924a.736.736,0,0,0-.763-.816.8.8,0,1,0,.763.816Zm-.022.539a.787.787,0,0,1-.747.407.963.963,0,0,1,0-1.924.834.834,0,0,1,.743.4l.005-1.053H67.1v2.518H66.92v-.353Zm-2.046-.672a.726.726,0,0,0-.767-.682.741.741,0,0,0-.764.682Zm-1.533.162a.738.738,0,0,0,.8.752.682.682,0,0,0,.712-.5l.177-.008a.863.863,0,0,1-.907.674.9.9,0,0,1-.957-.976.953.953,0,1,1,1.905.049ZM60,97.555h.175v.277a.775.775,0,0,1,.649-.333.6.6,0,0,1,.652.4.68.68,0,0,1,.654-.4c.491,0,.717.235.717.644v1.225h-.175V98.2a.489.489,0,0,0-.539-.533.55.55,0,0,0-.622.593v1.112h-.175v-1.2c0-.307-.154-.5-.54-.5a.58.58,0,0,0-.622.626v1.077H60Zm21.364,0h.176v.352a.785.785,0,0,1,.747-.407.964.964,0,0,1,0,1.925.828.828,0,0,1-.741-.4l-.007,1.054h-.176V97.555Zm.156.889a.735.735,0,0,0,.763.816.8.8,0,1,0-.763-.816ZM67.485,97.02a.126.126,0,1,1,.126.133A.13.13,0,0,1,67.485,97.02Z" transform="translate(-51.882 -83.747)" fill="#5f6765"/>
<path id="Path_21" data-name="Path 21" d="M244.039,99.841a.127.127,0,1,1,.126.133A.13.13,0,0,1,244.039,99.841Zm-.345,0a.131.131,0,0,1,.127-.133.133.133,0,0,1,0,.265A.131.131,0,0,1,243.694,99.841Zm18.835,0a.129.129,0,0,1,.124-.133.133.133,0,0,1,0,.265A.126.126,0,0,1,262.528,99.837Zm-9.99-2.874a.125.125,0,1,1,.126.133A.127.127,0,0,1,252.539,96.963Zm-.345,0a.126.126,0,1,1,.127.133A.128.128,0,0,1,252.194,96.963Zm-10.439.005a.126.126,0,1,1,.126.133A.13.13,0,0,1,241.755,96.969Zm-.344,0a.127.127,0,1,1,.126.133A.13.13,0,0,1,241.411,96.969Zm27.141-.157h.176v2.517h-.176Zm-18.306.023h.175v2.518h-.175Zm-.708,1.759V96.831h.176V98.6c0,.218-.007.752-.8.752h-2.831a.738.738,0,0,1-.7-.3c-.092.181-.294.337-.72.337s-.625-.154-.717-.337a.735.735,0,0,1-.7.3h-.525c-.2,0-.229-.153-.226-.364a.942.942,0,0,1-.816.4.962.962,0,1,1,.974-.944l0,.537c0,.137,0,.211.1.211h.492c.5,0,.617-.239.617-.6V97.518h.175v1.11c0,.357.134.6.628.6s.617-.238.617-.6v-1.11h.175v1.1c.005.342.131.57.618.57h.555v-2.36h.175v1.036a.784.784,0,0,1,.713-.382c.789,0,.789.534.789.754v.953h.6C249.42,99.19,249.539,98.951,249.539,98.594Zm-8.622-.152a.785.785,0,1,0,.766-.816A.77.77,0,0,0,240.917,98.442Zm7.225-.2c0-.359-.125-.6-.617-.6a.64.64,0,0,0-.71.649v.893h1.327Zm5.311.181v.552c0,.138,0,.211.1.211h1.007v-1c0-.219.007-.752.8-.752a1.473,1.473,0,0,1,.29.027l-.091.15a1.256,1.256,0,0,0-.192-.015c-.494,0-.628.239-.628.6v1h1.315v.162H253.52a.179.179,0,0,1-.189-.108A.74.74,0,0,1,253.3,99a.982.982,0,0,1-.815.384.961.961,0,1,1,.973-.959Zm-1.744.015a.786.786,0,1,0,.767-.816A.775.775,0,0,0,251.709,98.441Zm14.964.222c.019.319.154.528.614.528.483,0,.613-.242.613-.6v-1.8h.175V98.6c0,.216-.007.748-.789.752a.759.759,0,0,1-.679-.273.983.983,0,0,1-1.81,0,.764.764,0,0,1-.683.275h-2.089a.758.758,0,0,1-.682-.276.985.985,0,0,1-1.812,0,.758.758,0,0,1-.681.272h-.6c-.03.378-.217.747-.936.747-.529,0-.831-.165-.889-.61l.173-.015c.038.284.222.461.716.461.572,0,.721-.294.759-.583h-.721a.909.909,0,0,1-.981-.955.942.942,0,0,1,1.883.014v.778h.6c.437,0,.58-.18.609-.463.005-.054.008-.1.012-.139a.918.918,0,0,1,.962-.833.929.929,0,0,1,.967.932c.018.3.161.5.616.5h1.341V98.181c0-.357-.116-.6-.616-.6a.574.574,0,0,0-.516.195l-.153-.108a.791.791,0,0,1,.662-.249c.789,0,.8.534.8.752v1.012h.582c.461,0,.59-.2.614-.516a.971.971,0,0,1,1.936-.038Zm-8.592-.276a.7.7,0,0,0-.773-.75.712.712,0,0,0-.762.752.748.748,0,0,0,.828.8h.706Zm1.563.363a.795.795,0,0,0,1.588-.034c0-.024,0-.046,0-.066a.795.795,0,0,0-1.58-.042A.691.691,0,0,0,259.644,98.749Zm6.855-.024c0-.026,0-.043,0-.061a.794.794,0,0,0-1.586.031.794.794,0,1,0,1.589.03ZM245.28,99.841a.126.126,0,1,1,.126.133A.13.13,0,0,1,245.28,99.841Z" transform="translate(-208.166 -83.695)" fill="#5f6765"/>
<path id="Path_22" data-name="Path 22" d="M11.934,8.762a.289.289,0,0,1-.291.285.294.294,0,0,1-.3-.285.285.285,0,0,1,.3-.273A.28.28,0,0,1,11.934,8.762ZM28.821,7.124V5.365a.236.236,0,0,1,.262-.216.233.233,0,0,1,.262.225V7.045c0,.7.024,1.184-.357,1.542a1.527,1.527,0,0,1-1.088.371,1.607,1.607,0,0,1-1.1-.382,1.389,1.389,0,0,1-.346-1.131V5.376a.237.237,0,0,1,.268-.229.239.239,0,0,1,.271.241V7.5a.962.962,0,0,0,.226.79,1.018,1.018,0,0,0,.7.235.951.951,0,0,0,.658-.229C28.844,8.043,28.821,7.757,28.821,7.124ZM2.416,8.762a.291.291,0,0,1-.292.285.3.3,0,0,1-.3-.285.286.286,0,0,1,.3-.273A.281.281,0,0,1,2.416,8.762Zm5.213,0a.291.291,0,0,1-.292.285.3.3,0,0,1-.3-.285.286.286,0,0,1,.3-.273A.281.281,0,0,1,7.63,8.762Zm.8,0a.29.29,0,0,1-.291.285.293.293,0,0,1-.3-.285.285.285,0,0,1,.3-.273A.281.281,0,0,1,8.431,8.762ZM14.682,5.35l.11-.054a1.876,1.876,0,0,1,.49-.137,2.478,2.478,0,0,1,.334-.023,1.814,1.814,0,0,1,1.831,1.975,2.5,2.5,0,0,1-.047.494h3.146a1.02,1.02,0,0,0,.7-.235.963.963,0,0,0,.227-.79V4.008A.271.271,0,0,1,22.014,4V6.523a1.388,1.388,0,0,1-.348,1.134,1.593,1.593,0,0,1-1.1.38H17.6l-4.858,0a1.482,1.482,0,0,1-.984-.367,1.263,1.263,0,0,1-.093-.1,1.3,1.3,0,0,1-.095.1,1.527,1.527,0,0,1-1.087.369h-1.6a1.6,1.6,0,0,1-1.066-.38c-.111-.053-.141-.02-.176.011a1.52,1.52,0,0,1-1.084.371H4.993a1.577,1.577,0,0,1-1.05-.382c-.11-.053-.141-.02-.175.011a1.47,1.47,0,0,1-.984.368l-1.335,0a1.6,1.6,0,0,1-1.1-.382A1.394,1.394,0,0,1,0,6.524V5.372a.24.24,0,0,1,.269-.23.237.237,0,0,1,.268.241v1.2a.96.96,0,0,0,.227.79,1.02,1.02,0,0,0,.7.235l1.317,0a.9.9,0,0,0,.572-.227A.843.843,0,0,0,3.6,6.721V5.369a.239.239,0,0,1,.268-.23.237.237,0,0,1,.268.241v1.2a.964.964,0,0,0,.226.79.973.973,0,0,0,.635.233l1.576,0a.93.93,0,0,0,.656-.23.861.861,0,0,0,.244-.686V5.37a.27.27,0,0,1,.536.011v1.2a.96.96,0,0,0,.227.79,1,1,0,0,0,.66.234H10.5a.936.936,0,0,0,.656-.229A.924.924,0,0,0,11.4,6.61c0-.149,0-.31,0-.484V5.368a.266.266,0,0,1,.524-.009v.847c0,.633-.024.919.246,1.172a.912.912,0,0,0,.571.227h4.132a2.086,2.086,0,0,0,.066-.537A1.359,1.359,0,0,0,15.586,5.58H15.5a2.189,2.189,0,0,0-.334.035c-.195.035-.165.03-.349.074C14.626,5.752,14.553,5.464,14.682,5.35ZM28.194,3.935a.288.288,0,0,1-.292.283.3.3,0,0,1-.3-.283.286.286,0,0,1,.3-.275A.282.282,0,0,1,28.194,3.935ZM41.723,8.762a.288.288,0,0,1-.29.285.3.3,0,0,1-.3-.285.287.287,0,0,1,.3-.273A.28.28,0,0,1,41.723,8.762Zm.8,0a.29.29,0,0,1-.291.285.294.294,0,0,1-.3-.285.285.285,0,0,1,.3-.273A.281.281,0,0,1,42.523,8.762Zm14.539-.728.009-.438h2.136c.832-.024,1.051-.368,1.066-.967-.031-.6-.234-1-1.066-1.03a2.436,2.436,0,0,0-.359.042,3.143,3.143,0,0,0-.348.074c-.192.06-.267-.227-.138-.341l.108-.053a1.877,1.877,0,0,1,.491-.138,2.527,2.527,0,0,1,.336-.022,1.333,1.333,0,0,1,1.473,1.449A1.314,1.314,0,0,1,59.3,8.034Zm-.373-.246a.29.29,0,0,1-.292.284.294.294,0,0,1-.3-.284.285.285,0,0,1,.3-.275A.281.281,0,0,1,56.688,7.788ZM54.841,6.125c0,.7.023,1.184-.36,1.544a1.522,1.522,0,0,1-1.084.369,1.6,1.6,0,0,1-1.1-.38l-.165.011a1.528,1.528,0,0,1-1.085.369,1.734,1.734,0,0,1-.909-.234v.231l-2.923,0a1.6,1.6,0,0,1-1.1-.38c-.11-.053-.139-.02-.172.011a1.531,1.531,0,0,1-1.087.369l-1.9,0a1.559,1.559,0,0,1-1.009-.379h-.157a1.6,1.6,0,0,1-1.1.38l-2.584,0a1.509,1.509,0,0,1-.348.551,1.52,1.52,0,0,1-1.084.371,1.6,1.6,0,0,1-1.1-.382,1.017,1.017,0,0,1-.3-.545l-3.153.008a1.6,1.6,0,0,1-1.1-.38,1.392,1.392,0,0,1-.346-1.134V4a.271.271,0,0,1,.537.011V6.58a.964.964,0,0,0,.226.79,1.023,1.023,0,0,0,.7.235l3.067,0,.027-.16V6.7a1.441,1.441,0,0,1,.345-1.174,1.6,1.6,0,0,1,1.1-.382,1.522,1.522,0,0,1,1.084.371,1.621,1.621,0,0,1,.359,1.308v.41c0,.129,0,.252-.005.367h2.561a1.019,1.019,0,0,0,.7-.235.827.827,0,0,0,.226-.658V5.377a.239.239,0,0,1,.268-.242.242.242,0,0,1,.271.23l0,.373,0,.783c0,.349-.008.626.227.847a.962.962,0,0,0,.593.231l1.915,0a.942.942,0,0,0,.655-.229c.268-.253.245-.539.245-1.172l-.011-.885V4a.271.271,0,0,1,.537.011V6.124c0,.173,0,.333,0,.482a.937.937,0,0,0,.234.764,1.018,1.018,0,0,0,.7.235H49.6V5.365a.23.23,0,0,1,.234-.214c.208.011.291.095.3.215V6.786a.775.775,0,0,0,.225.585,1.023,1.023,0,0,0,.7.235.944.944,0,0,0,.656-.229c.268-.253.244-.539.244-1.172v-.84a.266.266,0,0,1,.524.009V6.581a.96.96,0,0,0,.226.789,1.019,1.019,0,0,0,.7.235.941.941,0,0,0,.656-.229c.268-.253.244-.539.244-1.172v-.84a.238.238,0,0,1,.264-.216.235.235,0,0,1,.262.226v.751ZM37.342,8.3c.245-.231.245-.488.244-1.015V6.859c0-.576-.007-.828-.244-1.051a.941.941,0,0,0-.658-.23,1.013,1.013,0,0,0-.7.235.957.957,0,0,0-.226.79V7.5a.958.958,0,0,0,.226.79,1.013,1.013,0,0,0,.7.235A.934.934,0,0,0,37.342,8.3ZM23.324,8.034V4.006A.271.271,0,0,1,23.861,4V8.034Z" transform="translate(0 -3.166)" fill="#3d4543"/>
<path id="Path_23" data-name="Path 23" d="M14.322,55.834V54.075a.266.266,0,0,1,.525.009v1.672c0,.7.022,1.183-.357,1.541a1.529,1.529,0,0,1-1.088.371,1.608,1.608,0,0,1-1.1-.383,1.391,1.391,0,0,1-.345-1.133V54.087a.271.271,0,0,1,.537.014V56.21a.961.961,0,0,0,.226.79,1.022,1.022,0,0,0,.7.235.941.941,0,0,0,.656-.23C14.346,56.753,14.322,56.467,14.322,55.834Zm1.437,1.76V54.087a.238.238,0,0,1,.268-.229.235.235,0,0,1,.267.215v3.094h1.652V57.6H15.759Zm6.514,0V54.07a.235.235,0,0,1,.235-.215c.208.011.291.095.3.215v.319l0,3.207h-.539Zm1.437,0,.394-3.469a.333.333,0,0,1,.368-.265.37.37,0,0,1,.344.235L25.9,56.91l1.05-2.82a.363.363,0,0,1,.319-.23.341.341,0,0,1,.388.264l.411,3.471h-.525l-.329-3.023-1.126,3.023h-.442l-1.151-3.023-.3,3.023Zm11.285-.751-.009-2.6v-.157a.244.244,0,0,1,.486-.012v3.523h-.533l-1.875-2.978.011,2.978h-.488V54.12c0-.225.2-.26.331-.26.172.007.229.08.352.257Zm6.478.751V54.075a.276.276,0,0,1,.537-.011v3.1h1.652v.428Zm4.314,0V54.06a.276.276,0,0,1,.537.011v1.353h1.824V54.071a.276.276,0,0,1,.537-.007v3.53h-.537V55.85H46.323v1.744Zm10.885,0V54.068a.24.24,0,0,1,.268-.214.238.238,0,0,1,.268.211v3.529ZM.264,53.868H.879a2.434,2.434,0,0,1,1.829.475,1.948,1.948,0,0,1,0,2.748,2.432,2.432,0,0,1-1.835.5H0V54.141A.242.242,0,0,1,.264,53.868Zm2.468,1.827a1.386,1.386,0,0,0-.424-1.073c-.346-.325-.741-.352-1.429-.352H.533v2.917h.5a1.752,1.752,0,0,0,1.3-.38A1.512,1.512,0,0,0,2.731,55.695ZM4.07,54.13c-.007-.183.107-.263.272-.263h.613a1.7,1.7,0,0,1,1.266.3.972.972,0,0,1,.31.743.876.876,0,0,1-.245.643,1.07,1.07,0,0,1-.639.295.576.576,0,0,1,.34.152,1.671,1.671,0,0,1,.31.52L6.811,57.6H6.248l-.459-.971C5.513,56.048,5.382,56,4.844,56h-.25v1.6H4.067V54.13ZM6,54.907a.618.618,0,0,0-.175-.447,1.1,1.1,0,0,0-.819-.2H4.595V55.6H4.78A1.462,1.462,0,0,0,5.8,55.377.651.651,0,0,0,6,54.907ZM18.25,57.594l1.229-3.184.126-.3a.357.357,0,0,1,.359-.252.367.367,0,0,1,.384.252l.149.356,1.219,3.127h-.563l-.361-.976H19.15l-.363.976Zm2.391-1.386-.674-1.821L19.3,56.209Zm7.9,1.386,1.229-3.184.124-.3a.36.36,0,0,1,.36-.252.367.367,0,0,1,.384.252l.15.356L32,57.594h-.559l-.365-.976H29.44l-.363.976Zm2.39-1.386-.671-1.821-.67,1.821Zm6.546,1.386L38.7,54.411l.124-.3a.358.358,0,0,1,.359-.252.365.365,0,0,1,.383.252l.15.356,1.216,3.127h-.56l-.361-.976h-1.64l-.365.976Zm2.391-1.386-.674-1.821-.667,1.821Zm9.348,1.386,1.227-3.184.126-.3a.357.357,0,0,1,.359-.252.37.37,0,0,1,.386.252l.147.356,1.218,3.127h-.559l-.365-.976H50.115l-.364.976Zm2.392-1.386-.677-1.821-.666,1.821Zm1.663,1.386V54.225c0-.267.068-.371.264-.371h.833a1.447,1.447,0,0,1,1.066.287.93.93,0,0,1,.311.718.8.8,0,0,1-.637.819.81.81,0,0,1,.763.835.986.986,0,0,1-.3.735c-.383.359-.884.348-1.6.348h-.7Zm1.938-2.725a.562.562,0,0,0-.154-.414,1.282,1.282,0,0,0-.919-.2h-.346v1.256h.306a1.443,1.443,0,0,0,.928-.208A.532.532,0,0,0,55.207,54.869Zm.119,1.653a.559.559,0,0,0-.18-.419,1.493,1.493,0,0,0-1.031-.208h-.329v1.289h.442a1.211,1.211,0,0,0,.925-.235A.616.616,0,0,0,55.327,56.523Zm2.845-2.668h1.1a1.448,1.448,0,0,1,1.066.287.936.936,0,0,1,.313.718.8.8,0,0,1-.639.819.809.809,0,0,1,.762.835.99.99,0,0,1-.3.735c-.384.359-.882.348-1.6.348h-.7V53.854Zm1.938,1.015a.572.572,0,0,0-.153-.414,1.275,1.275,0,0,0-.917-.2h-.348v1.256H59a1.455,1.455,0,0,0,.932-.208A.534.534,0,0,0,60.11,54.869Zm.122,1.653a.554.554,0,0,0-.18-.419,1.493,1.493,0,0,0-1.031-.208h-.329v1.289h.442c.467,0,.71-.034.924-.235A.611.611,0,0,0,60.231,56.523ZM8.772,54.791c0-.589.5-1,1.223-1.011a2.309,2.309,0,0,1,.855.181c.193.074.114.429-.1.36-.183-.043-.164-.043-.36-.083a1.294,1.294,0,0,0-.287-.032c-.484,0-.8.2-.8.537,0,.354.352.467.746.656.352.169,1.133.442,1.133,1.179,0,.617-.482,1.093-1.306,1.093a2.019,2.019,0,0,1-1.223-.4l.258-.346a1.8,1.8,0,0,0,.942.319c.49,0,.775-.275.775-.617,0-.41-.506-.61-.936-.808C9.19,55.588,8.772,55.34,8.772,54.791Z" transform="translate(0 -46.505)" fill="#3d4543"/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 16 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 44 KiB

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="8.134" height="14.534" viewBox="0 0 8.134 14.534">
<g id="arrow_right" transform="translate(-6.793 -6.793)">
<path id="Path_1250" data-name="Path 1250" d="M7.5,18" transform="translate(0 -3.94)" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
<path id="Path_1251" data-name="Path 1251" d="M7.5,20.621l6.927-6.56L7.5,7.5" transform="translate(0)" fill="none" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 553 B

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="22.245" height="20.148" viewBox="0 0 22.245 20.148">
<g id="credit_card_icon" transform="translate(0 -24.066)">
<path id="Path_1346" data-name="Path 1346" d="M22.208,35.622l-1.689-9.576A2.4,2.4,0,0,0,17.744,24.1L3.261,26.656a2.4,2.4,0,0,0-1.944,2.776l.124.7A2.4,2.4,0,0,0,0,32.333v9.485a2.4,2.4,0,0,0,2.4,2.4H16.773a2.4,2.4,0,0,0,2.4-2.4V38.591l1.1-.193a2.4,2.4,0,0,0,1.944-2.776ZM20.74,36.663a1.082,1.082,0,0,1-.7.448l-.869.153V32.333a2.4,2.4,0,0,0-2.4-2.4H2.734L2.6,29.2a1.089,1.089,0,0,1,.884-1.262l14.483-2.554a1.089,1.089,0,0,1,1.262.883l1.689,9.576A1.082,1.082,0,0,1,20.74,36.663Zm-3.968,6.244H2.4a1.09,1.09,0,0,1-1.089-1.089V37.173H17.862v4.645A1.09,1.09,0,0,1,16.773,42.907ZM2.4,31.244H16.773a1.09,1.09,0,0,1,1.089,1.089V32.9H1.307v-.569A1.09,1.09,0,0,1,2.4,31.244Zm15.466,2.965v1.658H1.307V34.208Z" transform="translate(0 0)"/>
<path id="Path_1347" data-name="Path 1347" d="M64.92,396.3H61.955a.654.654,0,0,0,0,1.307H64.92a.654.654,0,0,0,0-1.307Z" transform="translate(-58.631 -356.022)"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

@ -0,0 +1,17 @@
<svg xmlns="http://www.w3.org/2000/svg" width="95.266" height="25.878" viewBox="0 0 95.266 25.878">
<g id="hmg_shipping_logo" transform="translate(-114.266 -194)">
<g id="Path_1368" data-name="Path 1368" transform="translate(114.266 194)" fill="#fff">
<path d="M 92.51264953613281 25.37797546386719 L 2.752974987030029 25.37797546386719 C 1.510674953460693 25.37797546386719 0.5 24.36730003356934 0.5 23.125 L 0.5 2.752975225448608 C 0.5 1.510675191879272 1.510674953460693 0.5000002384185791 2.752974987030029 0.5000002384185791 L 92.51264953613281 0.5000002384185791 C 93.75495147705078 0.5000002384185791 94.765625 1.510675191879272 94.765625 2.752975225448608 L 94.765625 23.125 C 94.765625 24.36730003356934 93.75495147705078 25.37797546386719 92.51264953613281 25.37797546386719 Z" stroke="none"/>
<path d="M 2.752975463867188 1 C 1.786384582519531 1 1 1.786388397216797 1 2.752975463867188 L 1 23.125 C 1 24.09158706665039 1.786384582519531 24.87797546386719 2.752975463867188 24.87797546386719 L 92.51264953613281 24.87797546386719 C 93.47924041748047 24.87797546386719 94.265625 24.09158706665039 94.265625 23.125 L 94.265625 2.752975463867188 C 94.265625 1.786388397216797 93.47924041748047 1 92.51264953613281 1 L 2.752975463867188 1 M 2.752975463867188 0 L 92.51264953613281 0 C 94.03307342529297 0 95.265625 1.232549667358398 95.265625 2.752975463867188 L 95.265625 23.125 C 95.265625 24.64542579650879 94.03307342529297 25.87797546386719 92.51264953613281 25.87797546386719 L 2.752975463867188 25.87797546386719 C 1.232551574707031 25.87797546386719 0 24.64542579650879 0 23.125 L 0 2.752975463867188 C 0 1.232549667358398 1.232551574707031 0 2.752975463867188 0 Z" stroke="none" fill="#ccc"/>
</g>
<g id="Group_417" data-name="Group 417" transform="translate(-1932.136 317)">
<g id="Group_22" data-name="Group 22" transform="translate(2052 -119)">
<path id="Path_19" data-name="Path 19" d="M497.257,14.133s.591,0,1.007,0l3.154.015c.376,0,.69-.4.708-.978l0-2.636c0-.562.252-1,.641-1.027l.967-.008c.39.024.658.468.658,1.027l0,2.651c.018.578.28.955.659.955l4.246.011.008-3.258c0-.56-.269-1-.66-1.02l-1.706-.008c-.378,0-.674-.4-.691-.977l-.007-.881c.019-.578.317-.976.7-.976l1.716.005c.39-.026.644-.486.644-1.045l0-4.066a1.73,1.73,0,0,1-1.314.821H505.1c-.376,0-.69.41-.708.988V6.333c-.018.578-.313.985-.69.985l-.873-.007c-.379,0-.681-.4-.7-.97l0-2.64c-.018-.578-.317-.967-.694-.967h-4.188V5.982c0,.562.263,1.009.654,1.036l1.716-.007c.388.026.663.488.663,1.046l-.005.752c0,.56-.265,1.009-.655,1.035l-1.718,0c-.391.027-.654.471-.654,1.03ZM511.678,1.685V15.267a1.727,1.727,0,0,1-1.745,1.643h-13.4a1.719,1.719,0,0,1-1.737-1.644V1.659A1.728,1.728,0,0,1,496.53.01l13.393.005A1.757,1.757,0,0,1,511.678,1.685Z" transform="translate(-427.842 -0.01)" fill="#ed1c2b"/>
<path id="Path_20" data-name="Path 20" d="M80.948,99.367h-.175v-.325a.784.784,0,0,1-.713.382c-.789,0-.79-.534-.79-.752V97.555h.176v1.11c0,.357.124.6.62.6a.64.64,0,0,0,.708-.649V97.556h.175ZM77.986,97.5a.963.963,0,1,1-.97.963A.932.932,0,0,1,77.986,97.5Zm0,1.76a.8.8,0,1,0-.8-.8A.762.762,0,0,0,77.986,99.26Zm-2.1-1.7h.176v.379a.723.723,0,0,1,.7-.434.37.37,0,0,1,.129.023l.008.188a.437.437,0,0,0-.187-.026.648.648,0,0,0-.648.7v.98h-.176Zm-.58.357c-.009-.05-.009-.356-.009-.356h.176v1.713c0,.414-.142.867-.942.867-.528,0-.832-.166-.889-.612l.175-.014c.038.287.223.463.716.463.652,0,.766-.371.766-.7v-.327a.938.938,0,1,1-.786-1.449A.825.825,0,0,1,75.3,97.912Zm-1.559.494a.7.7,0,0,0,.778.778.713.713,0,0,0,.77-.782.775.775,0,0,0-1.548,0Zm-1.48-1.556h.173v2.518h-.173Zm-2.069,1.281c.058-.472.285-.632.8-.632.5,0,.789.123.789.536v1c0,.137,0,.2.1.2a.435.435,0,0,0,.146-.027l.014.16a.531.531,0,0,1-.2.031.177.177,0,0,1-.192-.114.461.461,0,0,1-.024-.127c0-.037,0-.076,0-.12a.9.9,0,0,1-.8.383,1.254,1.254,0,0,1-.17-.009.748.748,0,0,1-.235-.061.487.487,0,0,1-.3-.487c0-.378.306-.5.651-.526l.593-.042c.173-.014.249-.032.249-.242,0-.231-.12-.394-.62-.394-.442,0-.576.143-.621.459Zm1.417.25a.512.512,0,0,1-.267.08l-.575.042c-.284.022-.476.1-.476.363,0,.35.334.392.541.392.34,0,.775-.161.775-.575v-.3Zm-1.905-.241a.666.666,0,0,0-.71-.478.8.8,0,0,0,0,1.6.694.694,0,0,0,.732-.532l.177-.009a.852.852,0,0,1-.909.7A.962.962,0,1,1,69,97.5a.805.805,0,0,1,.884.631Zm-2.182-.586H67.7v1.812h-.175Zm-.583.924a.736.736,0,0,0-.763-.816.8.8,0,1,0,.763.816Zm-.022.539a.787.787,0,0,1-.747.407.963.963,0,0,1,0-1.924.834.834,0,0,1,.743.4l.005-1.053H67.1v2.518H66.92v-.353Zm-2.046-.672a.726.726,0,0,0-.767-.682.741.741,0,0,0-.764.682Zm-1.533.162a.738.738,0,0,0,.8.752.682.682,0,0,0,.712-.5l.177-.008a.863.863,0,0,1-.907.674.9.9,0,0,1-.957-.976.953.953,0,1,1,1.905.049ZM60,97.555h.175v.277a.775.775,0,0,1,.649-.333.6.6,0,0,1,.652.4.68.68,0,0,1,.654-.4c.491,0,.717.235.717.644v1.225h-.175V98.2a.489.489,0,0,0-.539-.533.55.55,0,0,0-.622.593v1.112h-.175v-1.2c0-.307-.154-.5-.54-.5a.58.58,0,0,0-.622.626v1.077H60Zm21.364,0h.176v.352a.785.785,0,0,1,.747-.407.964.964,0,0,1,0,1.925.828.828,0,0,1-.741-.4l-.007,1.054h-.176V97.555Zm.156.889a.735.735,0,0,0,.763.816.8.8,0,1,0-.763-.816ZM67.485,97.02a.126.126,0,1,1,.126.133A.13.13,0,0,1,67.485,97.02Z" transform="translate(-51.882 -83.747)" fill="#5f6765"/>
<path id="Path_21" data-name="Path 21" d="M244.039,99.841a.127.127,0,1,1,.126.133A.13.13,0,0,1,244.039,99.841Zm-.345,0a.131.131,0,0,1,.127-.133.133.133,0,0,1,0,.265A.131.131,0,0,1,243.694,99.841Zm18.835,0a.129.129,0,0,1,.124-.133.133.133,0,0,1,0,.265A.126.126,0,0,1,262.528,99.837Zm-9.99-2.874a.125.125,0,1,1,.126.133A.127.127,0,0,1,252.539,96.963Zm-.345,0a.126.126,0,1,1,.127.133A.128.128,0,0,1,252.194,96.963Zm-10.439.005a.126.126,0,1,1,.126.133A.13.13,0,0,1,241.755,96.969Zm-.344,0a.127.127,0,1,1,.126.133A.13.13,0,0,1,241.411,96.969Zm27.141-.157h.176v2.517h-.176Zm-18.306.023h.175v2.518h-.175Zm-.708,1.759V96.831h.176V98.6c0,.218-.007.752-.8.752h-2.831a.738.738,0,0,1-.7-.3c-.092.181-.294.337-.72.337s-.625-.154-.717-.337a.735.735,0,0,1-.7.3h-.525c-.2,0-.229-.153-.226-.364a.942.942,0,0,1-.816.4.962.962,0,1,1,.974-.944l0,.537c0,.137,0,.211.1.211h.492c.5,0,.617-.239.617-.6V97.518h.175v1.11c0,.357.134.6.628.6s.617-.238.617-.6v-1.11h.175v1.1c.005.342.131.57.618.57h.555v-2.36h.175v1.036a.784.784,0,0,1,.713-.382c.789,0,.789.534.789.754v.953h.6C249.42,99.19,249.539,98.951,249.539,98.594Zm-8.622-.152a.785.785,0,1,0,.766-.816A.77.77,0,0,0,240.917,98.442Zm7.225-.2c0-.359-.125-.6-.617-.6a.64.64,0,0,0-.71.649v.893h1.327Zm5.311.181v.552c0,.138,0,.211.1.211h1.007v-1c0-.219.007-.752.8-.752a1.473,1.473,0,0,1,.29.027l-.091.15a1.256,1.256,0,0,0-.192-.015c-.494,0-.628.239-.628.6v1h1.315v.162H253.52a.179.179,0,0,1-.189-.108A.74.74,0,0,1,253.3,99a.982.982,0,0,1-.815.384.961.961,0,1,1,.973-.959Zm-1.744.015a.786.786,0,1,0,.767-.816A.775.775,0,0,0,251.709,98.441Zm14.964.222c.019.319.154.528.614.528.483,0,.613-.242.613-.6v-1.8h.175V98.6c0,.216-.007.748-.789.752a.759.759,0,0,1-.679-.273.983.983,0,0,1-1.81,0,.764.764,0,0,1-.683.275h-2.089a.758.758,0,0,1-.682-.276.985.985,0,0,1-1.812,0,.758.758,0,0,1-.681.272h-.6c-.03.378-.217.747-.936.747-.529,0-.831-.165-.889-.61l.173-.015c.038.284.222.461.716.461.572,0,.721-.294.759-.583h-.721a.909.909,0,0,1-.981-.955.942.942,0,0,1,1.883.014v.778h.6c.437,0,.58-.18.609-.463.005-.054.008-.1.012-.139a.918.918,0,0,1,.962-.833.929.929,0,0,1,.967.932c.018.3.161.5.616.5h1.341V98.181c0-.357-.116-.6-.616-.6a.574.574,0,0,0-.516.195l-.153-.108a.791.791,0,0,1,.662-.249c.789,0,.8.534.8.752v1.012h.582c.461,0,.59-.2.614-.516a.971.971,0,0,1,1.936-.038Zm-8.592-.276a.7.7,0,0,0-.773-.75.712.712,0,0,0-.762.752.748.748,0,0,0,.828.8h.706Zm1.563.363a.795.795,0,0,0,1.588-.034c0-.024,0-.046,0-.066a.795.795,0,0,0-1.58-.042A.691.691,0,0,0,259.644,98.749Zm6.855-.024c0-.026,0-.043,0-.061a.794.794,0,0,0-1.586.031.794.794,0,1,0,1.589.03ZM245.28,99.841a.126.126,0,1,1,.126.133A.13.13,0,0,1,245.28,99.841Z" transform="translate(-208.166 -83.695)" fill="#5f6765"/>
<path id="Path_22" data-name="Path 22" d="M11.934,8.762a.289.289,0,0,1-.291.285.294.294,0,0,1-.3-.285.285.285,0,0,1,.3-.273A.28.28,0,0,1,11.934,8.762ZM28.821,7.124V5.365a.236.236,0,0,1,.262-.216.233.233,0,0,1,.262.225V7.045c0,.7.024,1.184-.357,1.542a1.527,1.527,0,0,1-1.088.371,1.607,1.607,0,0,1-1.1-.382,1.389,1.389,0,0,1-.346-1.131V5.376a.237.237,0,0,1,.268-.229.239.239,0,0,1,.271.241V7.5a.962.962,0,0,0,.226.79,1.018,1.018,0,0,0,.7.235.951.951,0,0,0,.658-.229C28.844,8.043,28.821,7.757,28.821,7.124ZM2.416,8.762a.291.291,0,0,1-.292.285.3.3,0,0,1-.3-.285.286.286,0,0,1,.3-.273A.281.281,0,0,1,2.416,8.762Zm5.213,0a.291.291,0,0,1-.292.285.3.3,0,0,1-.3-.285.286.286,0,0,1,.3-.273A.281.281,0,0,1,7.63,8.762Zm.8,0a.29.29,0,0,1-.291.285.293.293,0,0,1-.3-.285.285.285,0,0,1,.3-.273A.281.281,0,0,1,8.431,8.762ZM14.682,5.35l.11-.054a1.876,1.876,0,0,1,.49-.137,2.478,2.478,0,0,1,.334-.023,1.814,1.814,0,0,1,1.831,1.975,2.5,2.5,0,0,1-.047.494h3.146a1.02,1.02,0,0,0,.7-.235.963.963,0,0,0,.227-.79V4.008A.271.271,0,0,1,22.014,4V6.523a1.388,1.388,0,0,1-.348,1.134,1.593,1.593,0,0,1-1.1.38H17.6l-4.858,0a1.482,1.482,0,0,1-.984-.367,1.263,1.263,0,0,1-.093-.1,1.3,1.3,0,0,1-.095.1,1.527,1.527,0,0,1-1.087.369h-1.6a1.6,1.6,0,0,1-1.066-.38c-.111-.053-.141-.02-.176.011a1.52,1.52,0,0,1-1.084.371H4.993a1.577,1.577,0,0,1-1.05-.382c-.11-.053-.141-.02-.175.011a1.47,1.47,0,0,1-.984.368l-1.335,0a1.6,1.6,0,0,1-1.1-.382A1.394,1.394,0,0,1,0,6.524V5.372a.24.24,0,0,1,.269-.23.237.237,0,0,1,.268.241v1.2a.96.96,0,0,0,.227.79,1.02,1.02,0,0,0,.7.235l1.317,0a.9.9,0,0,0,.572-.227A.843.843,0,0,0,3.6,6.721V5.369a.239.239,0,0,1,.268-.23.237.237,0,0,1,.268.241v1.2a.964.964,0,0,0,.226.79.973.973,0,0,0,.635.233l1.576,0a.93.93,0,0,0,.656-.23.861.861,0,0,0,.244-.686V5.37a.27.27,0,0,1,.536.011v1.2a.96.96,0,0,0,.227.79,1,1,0,0,0,.66.234H10.5a.936.936,0,0,0,.656-.229A.924.924,0,0,0,11.4,6.61c0-.149,0-.31,0-.484V5.368a.266.266,0,0,1,.524-.009v.847c0,.633-.024.919.246,1.172a.912.912,0,0,0,.571.227h4.132a2.086,2.086,0,0,0,.066-.537A1.359,1.359,0,0,0,15.586,5.58H15.5a2.189,2.189,0,0,0-.334.035c-.195.035-.165.03-.349.074C14.626,5.752,14.553,5.464,14.682,5.35ZM28.194,3.935a.288.288,0,0,1-.292.283.3.3,0,0,1-.3-.283.286.286,0,0,1,.3-.275A.282.282,0,0,1,28.194,3.935ZM41.723,8.762a.288.288,0,0,1-.29.285.3.3,0,0,1-.3-.285.287.287,0,0,1,.3-.273A.28.28,0,0,1,41.723,8.762Zm.8,0a.29.29,0,0,1-.291.285.294.294,0,0,1-.3-.285.285.285,0,0,1,.3-.273A.281.281,0,0,1,42.523,8.762Zm14.539-.728.009-.438h2.136c.832-.024,1.051-.368,1.066-.967-.031-.6-.234-1-1.066-1.03a2.436,2.436,0,0,0-.359.042,3.143,3.143,0,0,0-.348.074c-.192.06-.267-.227-.138-.341l.108-.053a1.877,1.877,0,0,1,.491-.138,2.527,2.527,0,0,1,.336-.022,1.333,1.333,0,0,1,1.473,1.449A1.314,1.314,0,0,1,59.3,8.034Zm-.373-.246a.29.29,0,0,1-.292.284.294.294,0,0,1-.3-.284.285.285,0,0,1,.3-.275A.281.281,0,0,1,56.688,7.788ZM54.841,6.125c0,.7.023,1.184-.36,1.544a1.522,1.522,0,0,1-1.084.369,1.6,1.6,0,0,1-1.1-.38l-.165.011a1.528,1.528,0,0,1-1.085.369,1.734,1.734,0,0,1-.909-.234v.231l-2.923,0a1.6,1.6,0,0,1-1.1-.38c-.11-.053-.139-.02-.172.011a1.531,1.531,0,0,1-1.087.369l-1.9,0a1.559,1.559,0,0,1-1.009-.379h-.157a1.6,1.6,0,0,1-1.1.38l-2.584,0a1.509,1.509,0,0,1-.348.551,1.52,1.52,0,0,1-1.084.371,1.6,1.6,0,0,1-1.1-.382,1.017,1.017,0,0,1-.3-.545l-3.153.008a1.6,1.6,0,0,1-1.1-.38,1.392,1.392,0,0,1-.346-1.134V4a.271.271,0,0,1,.537.011V6.58a.964.964,0,0,0,.226.79,1.023,1.023,0,0,0,.7.235l3.067,0,.027-.16V6.7a1.441,1.441,0,0,1,.345-1.174,1.6,1.6,0,0,1,1.1-.382,1.522,1.522,0,0,1,1.084.371,1.621,1.621,0,0,1,.359,1.308v.41c0,.129,0,.252-.005.367h2.561a1.019,1.019,0,0,0,.7-.235.827.827,0,0,0,.226-.658V5.377a.239.239,0,0,1,.268-.242.242.242,0,0,1,.271.23l0,.373,0,.783c0,.349-.008.626.227.847a.962.962,0,0,0,.593.231l1.915,0a.942.942,0,0,0,.655-.229c.268-.253.245-.539.245-1.172l-.011-.885V4a.271.271,0,0,1,.537.011V6.124c0,.173,0,.333,0,.482a.937.937,0,0,0,.234.764,1.018,1.018,0,0,0,.7.235H49.6V5.365a.23.23,0,0,1,.234-.214c.208.011.291.095.3.215V6.786a.775.775,0,0,0,.225.585,1.023,1.023,0,0,0,.7.235.944.944,0,0,0,.656-.229c.268-.253.244-.539.244-1.172v-.84a.266.266,0,0,1,.524.009V6.581a.96.96,0,0,0,.226.789,1.019,1.019,0,0,0,.7.235.941.941,0,0,0,.656-.229c.268-.253.244-.539.244-1.172v-.84a.238.238,0,0,1,.264-.216.235.235,0,0,1,.262.226v.751ZM37.342,8.3c.245-.231.245-.488.244-1.015V6.859c0-.576-.007-.828-.244-1.051a.941.941,0,0,0-.658-.23,1.013,1.013,0,0,0-.7.235.957.957,0,0,0-.226.79V7.5a.958.958,0,0,0,.226.79,1.013,1.013,0,0,0,.7.235A.934.934,0,0,0,37.342,8.3ZM23.324,8.034V4.006A.271.271,0,0,1,23.861,4V8.034Z" transform="translate(0 -3.166)" fill="#3d4543"/>
<path id="Path_23" data-name="Path 23" d="M14.322,55.834V54.075a.266.266,0,0,1,.525.009v1.672c0,.7.022,1.183-.357,1.541a1.529,1.529,0,0,1-1.088.371,1.608,1.608,0,0,1-1.1-.383,1.391,1.391,0,0,1-.345-1.133V54.087a.271.271,0,0,1,.537.014V56.21a.961.961,0,0,0,.226.79,1.022,1.022,0,0,0,.7.235.941.941,0,0,0,.656-.23C14.346,56.753,14.322,56.467,14.322,55.834Zm1.437,1.76V54.087a.238.238,0,0,1,.268-.229.235.235,0,0,1,.267.215v3.094h1.652V57.6H15.759Zm6.514,0V54.07a.235.235,0,0,1,.235-.215c.208.011.291.095.3.215v.319l0,3.207h-.539Zm1.437,0,.394-3.469a.333.333,0,0,1,.368-.265.37.37,0,0,1,.344.235L25.9,56.91l1.05-2.82a.363.363,0,0,1,.319-.23.341.341,0,0,1,.388.264l.411,3.471h-.525l-.329-3.023-1.126,3.023h-.442l-1.151-3.023-.3,3.023Zm11.285-.751-.009-2.6v-.157a.244.244,0,0,1,.486-.012v3.523h-.533l-1.875-2.978.011,2.978h-.488V54.12c0-.225.2-.26.331-.26.172.007.229.08.352.257Zm6.478.751V54.075a.276.276,0,0,1,.537-.011v3.1h1.652v.428Zm4.314,0V54.06a.276.276,0,0,1,.537.011v1.353h1.824V54.071a.276.276,0,0,1,.537-.007v3.53h-.537V55.85H46.323v1.744Zm10.885,0V54.068a.24.24,0,0,1,.268-.214.238.238,0,0,1,.268.211v3.529ZM.264,53.868H.879a2.434,2.434,0,0,1,1.829.475,1.948,1.948,0,0,1,0,2.748,2.432,2.432,0,0,1-1.835.5H0V54.141A.242.242,0,0,1,.264,53.868Zm2.468,1.827a1.386,1.386,0,0,0-.424-1.073c-.346-.325-.741-.352-1.429-.352H.533v2.917h.5a1.752,1.752,0,0,0,1.3-.38A1.512,1.512,0,0,0,2.731,55.695ZM4.07,54.13c-.007-.183.107-.263.272-.263h.613a1.7,1.7,0,0,1,1.266.3.972.972,0,0,1,.31.743.876.876,0,0,1-.245.643,1.07,1.07,0,0,1-.639.295.576.576,0,0,1,.34.152,1.671,1.671,0,0,1,.31.52L6.811,57.6H6.248l-.459-.971C5.513,56.048,5.382,56,4.844,56h-.25v1.6H4.067V54.13ZM6,54.907a.618.618,0,0,0-.175-.447,1.1,1.1,0,0,0-.819-.2H4.595V55.6H4.78A1.462,1.462,0,0,0,5.8,55.377.651.651,0,0,0,6,54.907ZM18.25,57.594l1.229-3.184.126-.3a.357.357,0,0,1,.359-.252.367.367,0,0,1,.384.252l.149.356,1.219,3.127h-.563l-.361-.976H19.15l-.363.976Zm2.391-1.386-.674-1.821L19.3,56.209Zm7.9,1.386,1.229-3.184.124-.3a.36.36,0,0,1,.36-.252.367.367,0,0,1,.384.252l.15.356L32,57.594h-.559l-.365-.976H29.44l-.363.976Zm2.39-1.386-.671-1.821-.67,1.821Zm6.546,1.386L38.7,54.411l.124-.3a.358.358,0,0,1,.359-.252.365.365,0,0,1,.383.252l.15.356,1.216,3.127h-.56l-.361-.976h-1.64l-.365.976Zm2.391-1.386-.674-1.821-.667,1.821Zm9.348,1.386,1.227-3.184.126-.3a.357.357,0,0,1,.359-.252.37.37,0,0,1,.386.252l.147.356,1.218,3.127h-.559l-.365-.976H50.115l-.364.976Zm2.392-1.386-.677-1.821-.666,1.821Zm1.663,1.386V54.225c0-.267.068-.371.264-.371h.833a1.447,1.447,0,0,1,1.066.287.93.93,0,0,1,.311.718.8.8,0,0,1-.637.819.81.81,0,0,1,.763.835.986.986,0,0,1-.3.735c-.383.359-.884.348-1.6.348h-.7Zm1.938-2.725a.562.562,0,0,0-.154-.414,1.282,1.282,0,0,0-.919-.2h-.346v1.256h.306a1.443,1.443,0,0,0,.928-.208A.532.532,0,0,0,55.207,54.869Zm.119,1.653a.559.559,0,0,0-.18-.419,1.493,1.493,0,0,0-1.031-.208h-.329v1.289h.442a1.211,1.211,0,0,0,.925-.235A.616.616,0,0,0,55.327,56.523Zm2.845-2.668h1.1a1.448,1.448,0,0,1,1.066.287.936.936,0,0,1,.313.718.8.8,0,0,1-.639.819.809.809,0,0,1,.762.835.99.99,0,0,1-.3.735c-.384.359-.882.348-1.6.348h-.7V53.854Zm1.938,1.015a.572.572,0,0,0-.153-.414,1.275,1.275,0,0,0-.917-.2h-.348v1.256H59a1.455,1.455,0,0,0,.932-.208A.534.534,0,0,0,60.11,54.869Zm.122,1.653a.554.554,0,0,0-.18-.419,1.493,1.493,0,0,0-1.031-.208h-.329v1.289h.442c.467,0,.71-.034.924-.235A.611.611,0,0,0,60.231,56.523ZM8.772,54.791c0-.589.5-1,1.223-1.011a2.309,2.309,0,0,1,.855.181c.193.074.114.429-.1.36-.183-.043-.164-.043-.36-.083a1.294,1.294,0,0,0-.287-.032c-.484,0-.8.2-.8.537,0,.354.352.467.746.656.352.169,1.133.442,1.133,1.179,0,.617-.482,1.093-1.306,1.093a2.019,2.019,0,0,1-1.223-.4l.258-.346a1.8,1.8,0,0,0,.942.319c.49,0,.775-.275.775-.617,0-.41-.506-.61-.936-.808C9.19,55.588,8.772,55.34,8.772,54.791Z" transform="translate(0 -46.505)" fill="#3d4543"/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 16 KiB

@ -0,0 +1,8 @@
<svg xmlns="http://www.w3.org/2000/svg" width="17.332" height="14.475" viewBox="0 0 17.332 14.475">
<g id="quote_end" transform="translate(0 0)">
<g id="Group_1206" data-name="Group 1206" transform="translate(0 0)">
<path id="Path_1369" data-name="Path 1369" d="M2.945,14.418a4.592,4.592,0,0,1,1.269-.185,3.988,3.988,0,0,1,1.591.326c-.4-1.464-1.361-3.991-3.275-4.275a.455.455,0,0,1-.371-.327l-.418-1.5a.455.455,0,0,1,.376-.573,3.177,3.177,0,0,1,.428-.029c2.3,0,4.573,2.4,5.533,5.832.564,2.014.729,5.043-.659,6.949A4.145,4.145,0,0,1,4.05,22.332H4.032a4.032,4.032,0,0,1-1.087-7.915Z" transform="translate(8.84 -7.858)" fill="#ccc"/>
<path id="Path_1370" data-name="Path 1370" d="M49.146,16.322a4.042,4.042,0,0,1,2.424-1.9,4.592,4.592,0,0,1,1.269-.185,3.989,3.989,0,0,1,1.591.326c-.4-1.464-1.361-3.991-3.275-4.275a.455.455,0,0,1-.371-.327l-.418-1.5a.455.455,0,0,1,.376-.573,3.173,3.173,0,0,1,.428-.029c2.3,0,4.573,2.4,5.533,5.832.563,2.014.729,5.043-.66,6.95a4.144,4.144,0,0,1-3.369,1.693h-.018a4.032,4.032,0,0,1-3.511-6.011Z" transform="translate(-48.626 -7.858)" fill="#ccc"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -0,0 +1,8 @@
<svg xmlns="http://www.w3.org/2000/svg" width="17.332" height="14.475" viewBox="0 0 17.332 14.475">
<g id="quote_start" transform="translate(0 -7.858)">
<g id="Group_1206" data-name="Group 1206" transform="translate(0 7.858)">
<path id="Path_1369" data-name="Path 1369" d="M5.548,14.418a4.592,4.592,0,0,0-1.269-.185,3.988,3.988,0,0,0-1.591.326c.4-1.464,1.361-3.991,3.275-4.275a.455.455,0,0,0,.371-.327l.418-1.5a.455.455,0,0,0-.376-.573,3.177,3.177,0,0,0-.428-.029c-2.3,0-4.573,2.4-5.533,5.832-.564,2.014-.729,5.043.659,6.949a4.145,4.145,0,0,0,3.369,1.693h.018a4.032,4.032,0,0,0,1.087-7.915Z" transform="translate(0 -7.858)" fill="#ccc"/>
<path id="Path_1370" data-name="Path 1370" d="M56.6,16.322a4.042,4.042,0,0,0-2.424-1.9,4.592,4.592,0,0,0-1.269-.185,3.989,3.989,0,0,0-1.591.326c.4-1.464,1.361-3.991,3.275-4.275a.455.455,0,0,0,.371-.327l.418-1.5A.455.455,0,0,0,55,7.887a3.173,3.173,0,0,0-.428-.029c-2.3,0-4.573,2.4-5.533,5.832-.563,2.014-.729,5.043.66,6.95a4.144,4.144,0,0,0,3.369,1.693h.018A4.032,4.032,0,0,0,56.6,16.322Z" transform="translate(-39.786 -7.858)" fill="#ccc"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -0,0 +1,16 @@
<svg id="shipping_mark_icon" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
<g id="Group_1132" data-name="Group 1132" transform="translate(0 11.716)">
<g id="Group_1130" data-name="Group 1130" transform="translate(0 0.839)">
<path id="Path_1340" data-name="Path 1340" d="M9,362.56a19.9,19.9,0,0,1-6.161-.871C.493,360.892,0,359.87,0,359.154a2.508,2.508,0,0,1,1.535-1.974.527.527,0,0,1,.508.924c-.628.345-.988.728-.988,1.05,0,.394.558,1,2.124,1.536A18.83,18.83,0,0,0,9,361.505a18.83,18.83,0,0,0,5.821-.815c1.566-.532,2.124-1.142,2.124-1.536,0-.322-.36-.7-.988-1.05a.527.527,0,1,1,.508-.924A2.508,2.508,0,0,1,18,359.154c0,.716-.493,1.737-2.839,2.535A19.9,19.9,0,0,1,9,362.56Z" transform="translate(0 -357.115)" fill="#c9dff7"/>
<path id="Path_1341" data-name="Path 1341" d="M263.461,357.181a.527.527,0,0,0-.508.924c.628.345.988.728.988,1.05,0,.394-.558,1-2.124,1.536a18.831,18.831,0,0,1-5.821.815h0v1.055h0a19.9,19.9,0,0,0,6.161-.871c2.347-.8,2.839-1.819,2.839-2.535A2.508,2.508,0,0,0,263.461,357.181Z" transform="translate(-246.996 -357.116)" fill="#aecef2"/>
</g>
<g id="Group_1131" data-name="Group 1131" transform="translate(3.045)">
<path id="Path_1342" data-name="Path 1342" d="M92.565,337.362a15.281,15.281,0,0,1-3.981-.469c-1.31-.37-1.974-.906-1.974-1.592s.664-1.222,1.974-1.592a17.135,17.135,0,0,1,7.963,0c1.31.37,1.974.906,1.974,1.592s-.664,1.222-1.974,1.592A15.284,15.284,0,0,1,92.565,337.362ZM87.674,335.3a2.692,2.692,0,0,0,1.388.628,16.425,16.425,0,0,0,7.006,0,2.693,2.693,0,0,0,1.388-.628,2.693,2.693,0,0,0-1.388-.628,16.429,16.429,0,0,0-7.006,0A2.693,2.693,0,0,0,87.674,335.3Zm9.8.022h0Z" transform="translate(-86.61 -333.241)" fill="#c9dff7"/>
<path id="Path_1343" data-name="Path 1343" d="M259.978,333.709A15.281,15.281,0,0,0,256,333.24h0v1.055h0a14.8,14.8,0,0,1,3.5.378,2.693,2.693,0,0,1,1.388.628,2.693,2.693,0,0,1-1.388.628,14.8,14.8,0,0,1-3.5.378h0v1.055h0a15.28,15.28,0,0,0,3.981-.469c1.31-.37,1.974-.906,1.974-1.592S261.287,334.079,259.978,333.709Z" transform="translate(-250.041 -333.24)" fill="#aecef2"/>
</g>
</g>
<g id="Group_1133" data-name="Group 1133" transform="translate(4.098)">
<path id="Path_1344" data-name="Path 1344" d="M121.462,0a4.908,4.908,0,0,0-4.9,4.9c0,1.684,2.046,5.384,3.761,8.191a1.337,1.337,0,0,0,2.282,0c1.716-2.807,3.761-6.508,3.761-8.191A4.908,4.908,0,0,0,121.462,0Zm0,6.536a1.97,1.97,0,1,1,1.97-1.97A1.973,1.973,0,0,1,121.462,6.536Z" transform="translate(-116.56)" fill="#5ab145"/>
<path id="Path_1345" data-name="Path 1345" d="M256,0h0V2.6h0a1.97,1.97,0,1,1,0,3.941h0v7.2h0a1.328,1.328,0,0,0,1.141-.64c1.716-2.807,3.761-6.508,3.761-8.191A4.908,4.908,0,0,0,256,0Z" transform="translate(-251.094 0)" fill="#3f9d28"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.7 KiB

@ -0,0 +1,34 @@
<svg xmlns="http://www.w3.org/2000/svg" width="23.894" height="17.733" viewBox="0 0 23.894 17.733">
<g id="shipping_truck_icon" transform="translate(0 -66.008)">
<g id="Group_1177" data-name="Group 1177" transform="translate(4.667 68.808)">
<g id="Group_1176" data-name="Group 1176" transform="translate(0 0)">
<path id="Path_1362" data-name="Path 1362" d="M100.462,126.006a.467.467,0,1,0,.467.467A.467.467,0,0,0,100.462,126.006Z" transform="translate(-99.995 -126.006)"/>
</g>
</g>
<g id="Group_1179" data-name="Group 1179" transform="translate(0 66.008)">
<g id="Group_1178" data-name="Group 1178">
<path id="Path_1363" data-name="Path 1363" d="M21.977,72.8,21.3,71.449a1.392,1.392,0,0,0-1.252-.774h-3.9V67.408a1.4,1.4,0,0,0-1.4-1.4H1.4a1.4,1.4,0,0,0-1.4,1.4V79.541a1.4,1.4,0,0,0,1.4,1.4H2.8a2.789,2.789,0,0,0,.715,1.867H.467a.467.467,0,1,0,0,.933h22.96a.467.467,0,1,0,0-.933H22.245a2.788,2.788,0,0,0,.715-1.867c0-.027,0-.053,0-.08a1.4,1.4,0,0,0,.935-1.32v-2.58C23.893,76.417,24,76.925,21.977,72.8Zm-.706.675,1.4,2.8H18.013v-2.8ZM.933,77.208h.933v.933H.933Zm4.667,5.6a1.869,1.869,0,0,1-1.867-1.867,1.842,1.842,0,0,1,.038-.374,1.867,1.867,0,0,1,3.658,0v0a1.835,1.835,0,0,1,.037.372A1.869,1.869,0,0,1,5.6,82.808Zm0-4.667a2.81,2.81,0,0,0-2.64,1.867H1.4a.467.467,0,0,1-.467-.467v-.467h1.4a.467.467,0,0,0,.467-.467V76.741a.467.467,0,0,0-.467-.467H.933V67.408a.467.467,0,0,1,.467-.467H14.747a.467.467,0,0,1,.467.467v12.6H8.24A2.81,2.81,0,0,0,5.6,78.141Zm2.085,4.667A2.788,2.788,0,0,0,8.4,80.941h8.96a2.789,2.789,0,0,0,.715,1.867H7.685Zm12.475,0a1.869,1.869,0,0,1-1.867-1.867,1.842,1.842,0,0,1,.038-.374,1.867,1.867,0,0,1,3.658,0v0a1.835,1.835,0,0,1,.037.372A1.869,1.869,0,0,1,20.16,82.808Zm2.8-3.267a.466.466,0,0,1-.193.377,2.8,2.8,0,0,0-5.247.089H16.147v-8.4h3.9a.464.464,0,0,1,.417.258l.338.675H17.547a.467.467,0,0,0-.467.467v3.733a.467.467,0,0,0,.467.467H22.96Z" transform="translate(0 -66.008)"/>
</g>
</g>
<g id="Group_1181" data-name="Group 1181" transform="translate(6.533 68.808)">
<g id="Group_1180" data-name="Group 1180" transform="translate(0 0)">
<path id="Path_1364" data-name="Path 1364" d="M146.341,126.006h-5.88a.467.467,0,0,0,0,.933h5.88a.467.467,0,1,0,0-.933Z" transform="translate(-139.994 -126.006)"/>
</g>
</g>
<g id="Group_1183" data-name="Group 1183" transform="translate(8.4 70.675)">
<g id="Group_1182" data-name="Group 1182" transform="translate(0 0)">
<path id="Path_1365" data-name="Path 1365" d="M184.472,166h-4.013a.467.467,0,0,0,0,.933h4.013a.467.467,0,0,0,0-.933Z" transform="translate(-179.992 -166.004)"/>
</g>
</g>
<g id="Group_1185" data-name="Group 1185" transform="translate(19.227 80.008)">
<g id="Group_1184" data-name="Group 1184">
<path id="Path_1366" data-name="Path 1366" d="M412.916,366a.933.933,0,1,0,.933.933A.934.934,0,0,0,412.916,366Z" transform="translate(-411.983 -365.996)"/>
</g>
</g>
<g id="Group_1187" data-name="Group 1187" transform="translate(4.667 80.008)">
<g id="Group_1186" data-name="Group 1186">
<path id="Path_1367" data-name="Path 1367" d="M100.929,366a.933.933,0,1,0,.933.933A.934.934,0,0,0,100.929,366Z" transform="translate(-99.996 -365.996)"/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.2 KiB

@ -0,0 +1,24 @@
<svg id="success_review_icon" xmlns="http://www.w3.org/2000/svg" width="99.663" height="114.999" viewBox="0 0 99.663 114.999">
<g id="_011---Approved-Cleaning" data-name="011---Approved-Cleaning" transform="translate(0 0)">
<path id="Rectangle-path" d="M3,0H18a3,3,0,0,1,3,3V47a3,3,0,0,1-3,3H3a3,3,0,0,1-3-3V3A3,3,0,0,1,3,0Z" transform="translate(1.832 63.499)" fill="#e8ab22"/>
<path id="Shape" d="M11.75,33H6a5.75,5.75,0,0,1,5.75,5.75V77.082A5.75,5.75,0,0,1,6,82.832h5.75a5.75,5.75,0,0,0,5.75-5.75V38.75A5.75,5.75,0,0,0,11.75,33Z" transform="translate(5.5 30.248)" fill="#c68d0e"/>
<path id="Shape-2" data-name="Shape" d="M75.248,73.933H71.415a5.75,5.75,0,0,1,0,11.5H67.581a5.75,5.75,0,1,1,0,11.5h-34.5A23.054,23.054,0,0,1,24.5,95.418c-1.878-.747-3.527-1.955-5.347-2.837a14.34,14.34,0,0,0-6.191-1.4H12V52.85a20.379,20.379,0,0,0,11-3.239C29.92,45.2,40.4,37.192,38.142,27c-.767-3.431-1.054-6.785,2.607-8.644,4.063-2.07,7.954.556,9.851,3.872,6.382,11.174-4.772,28.711-4.772,28.711h27.5a5.75,5.75,0,0,1,0,11.5h1.917a5.75,5.75,0,1,1,0,11.5Z" transform="translate(10.999 16.147)" fill="#ffe0b2"/>
<path id="Shape-3" data-name="Shape" d="M55.479,56.313A5.75,5.75,0,0,0,51.416,46.5H49.5a5.75,5.75,0,0,0,0-11.5H43.75a5.75,5.75,0,0,1,0,11.5h1.917a5.75,5.75,0,1,1,0,11.5H41.833a5.75,5.75,0,1,1,0,11.5H38A5.75,5.75,0,0,1,38,81h5.75a5.75,5.75,0,0,0,0-11.5h3.833a5.75,5.75,0,1,0,0-11.5h3.833A5.736,5.736,0,0,0,55.479,56.313Z" transform="translate(34.831 32.081)" fill="#dfc49c"/>
<path id="Shape-4" data-name="Shape" d="M31.065,22.221c4.259,7.456.709,17.746-2.126,23.766a3.45,3.45,0,0,0,3.1,4.945S43.2,33.394,36.815,22.221c-1.884-3.295-5.736-5.9-9.775-3.906A9.744,9.744,0,0,1,31.065,22.221Z" transform="translate(24.785 16.15)" fill="#dfc49c"/>
<path id="Shape-5" data-name="Shape" d="M64.535,20.166C47.267,20.166,47.267,1,47.267,1s0,19.166-17.267,19.166c17.267,0,17.267,19.166,17.267,19.166s0-19.166,17.269-19.166Z" transform="translate(27.498 0.917)" fill="#ffdc00"/>
<path id="Shape-6" data-name="Shape" d="M29,26.416C17.5,26.416,17.5,13,17.5,13S17.5,26.416,6,26.416c11.5,0,11.5,13.416,11.5,13.416S17.5,26.416,29,26.416Z" transform="translate(5.5 11.916)" fill="#ffdc00"/>
<g id="Group_1203" data-name="Group 1203">
<path id="Shape-7" data-name="Shape" d="M93.913,69.11a7.641,7.641,0,0,0-3.768-6.564A7.576,7.576,0,0,0,92,57.61a7.666,7.666,0,0,0-7.666-7.666H60.12c3-5.708,8.445-18.466,3.143-27.747-2.333-4.077-7.206-7.266-12.383-4.629-5.4,2.745-4.192,8.167-3.609,10.769,1.485,6.677-3.323,13.608-14.294,20.584a18.591,18.591,0,0,1-8.37,2.821,7.653,7.653,0,0,0-7.358-5.633H7.666A7.666,7.666,0,0,0,0,53.777V92.109a7.666,7.666,0,0,0,7.666,7.666h9.583a7.666,7.666,0,0,0,7.383-5.711,12.521,12.521,0,0,1,4.7,1.184c.74.351,1.447.767,2.156,1.177a26.389,26.389,0,0,0,3.3,1.706,25.063,25.063,0,0,0,9.3,1.644h34.5a7.666,7.666,0,0,0,6.352-11.954,7.632,7.632,0,0,0,3.833-11.5,7.588,7.588,0,0,0,5.148-7.212ZM17.249,95.942H7.666a3.833,3.833,0,0,1-3.833-3.833V53.777a3.833,3.833,0,0,1,3.833-3.833h9.583a3.833,3.833,0,0,1,3.833,3.833V92.109A3.833,3.833,0,0,1,17.249,95.942ZM88.955,71.818a3.8,3.8,0,0,1-2.708,1.125H72.831a1.917,1.917,0,1,0,0,3.833h9.583a3.833,3.833,0,0,1,0,7.666H72.831a1.917,1.917,0,1,0,0,3.833h5.75a3.833,3.833,0,0,1,0,7.666h-34.5a21.18,21.18,0,0,1-7.858-1.365,22.94,22.94,0,0,1-2.815-1.468c-.8-.464-1.6-.924-2.428-1.321a16.389,16.389,0,0,0-6.064-1.533V55.6a22.463,22.463,0,0,0,10.118-3.45C47.511,44.211,52.887,35.918,51.012,27.5c-.866-3.877-.477-5.46,1.606-6.516,3.381-1.725,6.193,1.15,7.318,3.114,5.729,10.031-4.621,26.566-4.726,26.733a1.917,1.917,0,0,0,1.618,2.95h27.5a3.833,3.833,0,1,1,0,7.666h-11.5a1.917,1.917,0,1,0,0,3.833H86.247a3.833,3.833,0,0,1,2.708,6.541Z" transform="translate(0 15.221)"/>
<path id="Shape-8" data-name="Shape" d="M48.183,0a1.917,1.917,0,0,0-1.917,1.861v.056c0,.705-.174,17.249-15.35,17.249a1.917,1.917,0,0,0,0,3.833c15.116,0,15.348,16.548,15.35,17.249A1.917,1.917,0,1,0,50.1,40.3v-.052C50.1,39.543,50.274,23,65.452,23a1.917,1.917,0,1,0,0-3.833C50.334,19.166,50.1,2.618,50.1,1.917A1.917,1.917,0,0,0,48.183,0Zm8.531,21.083a18.208,18.208,0,0,0-8.531,9.652,18.2,18.2,0,0,0-8.531-9.652,18.2,18.2,0,0,0,8.531-9.652A18.208,18.208,0,0,0,56.714,21.083Z" transform="translate(26.581 0)"/>
<path id="Shape-9" data-name="Shape" d="M20.333,13.919v-.011a1.917,1.917,0,0,0-3.833.012c0,.47-.161,11.5-9.583,11.5a1.917,1.917,0,1,0,0,3.833c9.422,0,9.583,11.034,9.583,11.5v.012a1.917,1.917,0,1,0,3.833-.012c0-.47.161-11.5,9.583-11.5a1.917,1.917,0,1,0,0-3.833C20.494,25.419,20.333,14.385,20.333,13.919Zm2.576,13.416a12.881,12.881,0,0,0-4.493,5.2,12.881,12.881,0,0,0-4.493-5.2,12.87,12.87,0,0,0,4.493-5.2A12.87,12.87,0,0,0,22.909,27.336Z" transform="translate(4.583 10.996)"/>
<path id="Shape-10" data-name="Shape" d="M49.833,22.917a1.917,1.917,0,1,0-3.833,0V26.75a1.917,1.917,0,1,0,3.833,0Z" transform="translate(42.164 19.249)"/>
<path id="Shape-11" data-name="Shape" d="M47.917,34.666a1.917,1.917,0,0,0,1.917-1.917V28.917a1.917,1.917,0,1,0-3.833,0V32.75A1.917,1.917,0,0,0,47.917,34.666Z" transform="translate(42.164 24.748)"/>
<path id="Shape-12" data-name="Shape" d="M53.75,28.833a1.917,1.917,0,1,0,0-3.833H49.917a1.917,1.917,0,0,0,0,3.833Z" transform="translate(43.997 22.915)"/>
<path id="Shape-13" data-name="Shape" d="M47.75,25H43.917a1.917,1.917,0,1,0,0,3.833H47.75a1.917,1.917,0,1,0,0-3.833Z" transform="translate(38.497 22.915)"/>
<path id="Shape-14" data-name="Shape" d="M22.073,10.783l2.875,2.875a1.917,1.917,0,0,0,2.71-2.71L24.783,8.073a1.917,1.917,0,1,0-2.71,2.71Z" transform="translate(19.696 6.863)"/>
<path id="Shape-15" data-name="Shape" d="M20.425,9.135a1.917,1.917,0,0,0,2.71-2.71L20.26,3.55a1.917,1.917,0,0,0-2.71,2.71Z" transform="translate(15.593 2.761)"/>
<path id="Shape-16" data-name="Shape" d="M17.561,13.658a1.917,1.917,0,0,0,2.71,0l2.875-2.875a1.917,1.917,0,1,0-2.71-2.71l-2.875,2.875a1.917,1.917,0,0,0,0,2.71Z" transform="translate(15.582 6.863)"/>
<path id="Shape-17" data-name="Shape" d="M23.416,9.719a1.917,1.917,0,0,0,1.355-.562l2.875-2.875a1.917,1.917,0,1,0-2.71-2.71L22.061,6.448a1.917,1.917,0,0,0,1.355,3.272Z" transform="translate(19.707 2.739)"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 6.1 KiB

@ -8,6 +8,8 @@ const MAX_SMALL_SCREEN = 660;
const BASE_URL = 'https://hmgwebservices.com/';
const PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
const GET_PROJECT = 'Services/Lists.svc/REST/GetProject';
///Doctor
@ -327,6 +329,11 @@ const GET_E_REFERRALS = "Services/Patients.svc/REST/GetEReferrals";
//Pharmacy wishlist
const GET_WISHLIST = "http://swd-pharapp-01:7200/api/shopping_cart_items/";
//Pharmacy address
const GET_ADDRESS = "https://uat.hmgwebservices.com/epharmacy/api/Customers/272843?fields=addresses";
//order + order details 'orders?customer=1,fields=id,order_total,order_status,order_statusn,order_status_id,created_on_utc&page=' + page_id + '&limit=200&customer_id='+ custmerId,
const GET_ORDER = "https://uat.hmgwebservices.com/epharmacy/api/orders?customer=1,fields=id,order_total,order_status,order_statusn,order_status_id,created_on_utc&page=1&limit=200&customer_id=1367368";
const GET_ORDER_DETAILS = "https://uat.hmgwebservices.com/epharmacy/api/orders/3584";
const TIMER_MIN = 10;

@ -622,4 +622,31 @@ const Map<String, Map<String, String>> localizedValues = {
"delete": {"en": "Delete", "ar": " حذف"},
"addAddress": {"en": "ADD A NEW ADDRESS", "ar": " اضافة عنوان جديد"},
"addNewAddress": {"en": "Add New Address", "ar": " اضافة عنوان جديد"},
"order": {"en": "My Order", "ar": " طلباتي"},
"delivered": {"en": "Delivered", "ar": " تم التوصيل"},
"pending": {"en": "Pending", "ar": " معلقة "},
"processing": {"en": "Processing", "ar": " تحت المعالجة"},
"cancelled": {"en": "Cancelled", "ar": " ملغي"},
"writeReview": {"en": "Write Review", "ar": " اكتب تقييمك"},
"shareReview": {"en": "SHARE REVIEW", "ar": " اكتب تقييمك"},
"backMyAccount": {"en": "BACK TO MY ACCOUNT ", "ar": " الرجوع لحسابي الشخصي"},
"reviewSuccessful": {"en": "Review Successful", "ar": " تقييم ناجح"},
"reviewShared": {"en": "Your review has been shared on product review section", "ar": " تمت مشاركة تقييمك في قسم تقييم المنتج"},
"reviewComment": {"en": "Your reviews help other to choose better product", "ar": " تقييمك سوف يساعد الأخرين في اختيار المنتج الأفضل"},
"shippingAddress": {"en": "SHIPPING ADDRESS", "ar": " عنوان الشحن"},
"shippedMethod": {"en": "SHIP BY:", "ar": " الشحن بواسطة:"},
"orderDetail": {"en": "Order Detail", "ar": " تفاصيل الطلب"},
"orderSummary": {"en": "Order Summary", "ar": " تفاصيل المنتج"},
"subtotal": {"en": "Subtotal", "ar": " المجموع"},
"shipping": {"en": "Shipping", "ar": " الشحن"},
"vat": {"en": "VAT (15%)", "ar": "(15%) القيمة المضافة"},
"total": {"en": "TOTAL", "ar": " المجموع الكلي"},
"sar": {"en": "SAR", "ar": " ر.س "},
"payOnline": {"en": "PAY ONLINE", "ar": "اتمام عملية الدفع "},
"cancelOrder": {"en": "CANCEL ORDER", "ar": "الغاء الطلب "},
"confirmAddress": {"en": "CONFIRM ADDRESS ", "ar": " تأكيد العنوان "},
"confirmLocation": {"en": "CONFIRM LOCATION ", "ar": " تأكيد الموقع "},
"confirmDeleteMsg": {"en": "Are you sure! want to delete ", "ar": "هل انت متأكد تريد الحذف "},
"confirmDelete": {"en": "DELETE", "ar": "حذف"},
"confirmCancellation": {"en": "Are you sure! want to cancel this order ", "ar": "هل انت متأكد تريد حذف هذا المنتج "},
};

@ -9,8 +9,12 @@ import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart';
import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/wishlist.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/order/OrderDetails.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/AddAddress.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/profile/profile.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/order/Order.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/order/ProductReview.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
@ -474,7 +478,7 @@ class _HomePageState extends State<HomePage> {
),
DashboardItem(
onTap: () => Navigator.push(
context, FadePage(page: PharmacyAddressesPage())),
context, FadePage(page: OrderPage())),
child: Center(
child: Padding(
padding: const EdgeInsets.all(15.0),
@ -501,10 +505,6 @@ class _HomePageState extends State<HomePage> {
),
height: MediaQuery.of(context).size.width * 0.4,
imageName: 'al-habib_onlne_pharmacy_bg.png',
onTap: () {
Navigator.push(
context, FadePage(page: WishlistPage()));
},
),
DashboardItem(
child: Center(

@ -0,0 +1,781 @@
import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/services/pharmacy_services/order_service.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/order/OrderDetails.dart';
class OrderPage extends StatefulWidget {
@override
_OrderPageState createState() => _OrderPageState();
}
class _OrderPageState extends State<OrderPage> with SingleTickerProviderStateMixin{
TabController _tabController;
AppSharedPreferences sharedPref = AppSharedPreferences();
@override
void initState() {
WidgetsBinding.instance.addPostFrameCallback((_) => getOrder());
super.initState();
_tabController = new TabController(length: 4, vsync: this,);
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
centerTitle: true,
title: Text(TranslationBase.of(context).order, style: TextStyle(color:Colors.white)),
backgroundColor: Colors.green,
),
body: Container(
child: Column(
children: [
TabBar(
tabs: [
Tab(text: TranslationBase.of(context).delivered),
Tab(text: TranslationBase.of(context).processing),
Tab(text: TranslationBase.of(context).pending),
Tab(text: TranslationBase.of(context).cancelled),
],
controller: _tabController,
),
Divider(
color: Colors.grey[350],
height: 10,
thickness: 6,
indent: 0,
endIndent: 0,
),
Expanded(
child: new TabBarView(
physics: NeverScrollableScrollPhysics(),
children: [
getDeliveredOrder(),
getProcessingOrder(),
getPendingOrder(),
getCancelledOrder(),
],
controller: _tabController,
),
),
],
),
),
);
}
Widget getDeliveredOrder(){
return Container(
width: MediaQuery.of(context).size.width,
child: SingleChildScrollView(
child: Column(
children:<Widget> [
ListView.builder(
scrollDirection: Axis.vertical,
shrinkWrap: true,
physics: ScrollPhysics(),
itemCount: 2 ,
itemBuilder: (context, index){
return Container(
child: Column(
children:<Widget> [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children:<Widget> [
Container(
margin: EdgeInsets.all(8.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children:<Widget> [
Row(
children: [
Container(
margin: EdgeInsets.only(right: 5),
child: Text('Order#:',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
Container(
child: Text('3183',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
],
),
SizedBox(
height: 5,),
Row(
children: [
Container(
margin: EdgeInsets.only(right: 5),
child: Text('Date',
style: TextStyle(fontSize: 14.0,
),
),
),
Container(
child: Text('Aug 12, 2020',
style: TextStyle(fontSize: 14.0,
),
),
),
],
),
],
),
),
Container(
margin: EdgeInsets.all(8.0),
child: InkWell(
onTap: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) => OrderDetailsPage()));
},
child: SvgPicture.asset(
'assets/images/pharmacy/arrow_right.svg',
height: 20,
width: 20,),
),
),
],
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 1,
indent: 0,
endIndent: 0,
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Container(
margin: EdgeInsets.only(left: 8, right: 8, top: 1, bottom: 8),
padding: EdgeInsets.only(left: 13.0, right: 13.0),
decoration: BoxDecoration(
border: Border.all(
color: Colors.blue[700],
style: BorderStyle.solid,
width: 5.0,
),
color: Colors.blue[700],
borderRadius: BorderRadius.circular(30.0)
),
child: Text(
TranslationBase.of(context).delivered,
style: TextStyle(
color: Colors.white,
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
),
),
Container(
margin: EdgeInsets.only(left: 8, right: 8, top: 1, bottom: 8),
child: Column(
// crossAxisAlignment: CrossAxisAlignment.end,
children:<Widget> [
Row(
children: [
Container(
margin: EdgeInsets.only(left: 5),
child: Text('564',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
Container(
margin: EdgeInsets.only(left: 5),
child: Text('SAR',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
],
),
SizedBox(
height: 5,),
Row(
children: [
Container(
child: Text('12',
style: TextStyle(fontSize: 14.0,
),
),
),
Container(
margin: EdgeInsets.only(left: 5),
child: Text('items(s)',
style: TextStyle(fontSize: 14.0,
),
),
),
],
),
],
),
),
],
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 8,
indent: 0,
endIndent: 0,
),
],
),
);
}
)
],
),
),
);
}
Widget getProcessingOrder(){
return Container(
child: SingleChildScrollView(
child: Column(
children:<Widget> [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children:<Widget> [
Container(
margin: EdgeInsets.all(8),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children:<Widget> [
Row(
children: [
Container(
margin: EdgeInsets.only(right: 5),
child: Text('Order#:',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
Container(
child: Text('3183',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
],
),
SizedBox(
height: 5,),
Row(
children: [
Container(
margin: EdgeInsets.only(right: 5),
child: Text('Date',
style: TextStyle(fontSize: 14.0,
),
),
),
Container(
child: Text('Aug 12, 2020',
style: TextStyle(fontSize: 14.0,
),
),
),
],
),
],
),
),
Container(
margin: EdgeInsets.all(8),
child: InkWell(
onTap: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) => OrderDetailsPage()));
},
child: SvgPicture.asset(
'assets/images/pharmacy/arrow_right.svg',
height: 20,
width: 20,),
),
),
],
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 1,
indent: 0,
endIndent: 0,
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Container(
margin: EdgeInsets.only(left: 8, right: 8, top: 1, bottom: 8),
padding: EdgeInsets.only(left: 13.0, right: 13.0),
decoration: BoxDecoration(
border: Border.all(
color: Colors.green,
style: BorderStyle.solid,
width: 5.0,
),
color: Colors.green,
borderRadius: BorderRadius.circular(30.0)
),
child: Text(
TranslationBase.of(context).processing,
style: TextStyle(
color: Colors.white,
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
),
),
Container(
margin: EdgeInsets.only(left: 8, right: 8, top: 1, bottom: 8),
child: Column(
// crossAxisAlignment: CrossAxisAlignment.end,
children:<Widget> [
Row(
children: [
Container(
margin: EdgeInsets.only(left: 5),
child: Text('564',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
Container(
margin: EdgeInsets.only(left: 5),
child: Text('SAR',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
],
),
SizedBox(
height: 5,),
Row(
children: [
Container(
child: Text('12',
style: TextStyle(fontSize: 14.0,
),
),
),
Container(
margin: EdgeInsets.only(left: 5),
child: Text('items(s)',
style: TextStyle(fontSize: 14.0,
),
),
),
],
),
],
),
),
],
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 8,
indent: 0,
endIndent: 0,
),
],
),
),
);
}
Widget getPendingOrder(){
return Container(
child: SingleChildScrollView(
child: Column(
children:<Widget> [
ListView.builder(
scrollDirection: Axis.vertical,
shrinkWrap: true,
physics: ScrollPhysics(),
itemCount: 2 ,
itemBuilder: (context, index){
return Container(
child: SingleChildScrollView(
child: Column(
children:<Widget> [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children:<Widget> [
Container(
margin: EdgeInsets.all(8.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children:<Widget> [
Row(
children: [
Container(
margin: EdgeInsets.only(right: 5),
child: Text('Order#:',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
Container(
child: Text('3183',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
],
),
SizedBox(
height: 5,),
Row(
children: [
Container(
margin: EdgeInsets.only(right: 5),
child: Text('Date',
style: TextStyle(fontSize: 14.0,
),
),
),
Container(
child: Text('Aug 12, 2020',
style: TextStyle(fontSize: 14.0,
),
),
),
],
),
],
),
),
Container(
margin: EdgeInsets.all( 8.0),
child: InkWell(
onTap: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) => OrderDetailsPage()));
},
child: SvgPicture.asset(
'assets/images/pharmacy/arrow_right.svg',
height: 20,
width: 20,),
),
),
],
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 1,
indent: 0,
endIndent: 0,
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Container(
margin: EdgeInsets.all(8.0),
padding: EdgeInsets.only(left: 13.0, right: 13.0),
decoration: BoxDecoration(
border: Border.all(
color: Colors.orange[300],
style: BorderStyle.solid,
width: 5.0,
),
color: Colors.orange[300],
borderRadius: BorderRadius.circular(30.0)
),
child: Text(
TranslationBase.of(context).pending,
style: TextStyle(
color: Colors.white,
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
),
),
Container(
margin: EdgeInsets.all(8.0),
child: Column(
// crossAxisAlignment: CrossAxisAlignment.end,
children:<Widget> [
Row(
children: [
Container(
margin: EdgeInsets.only(left: 5),
child: Text('564',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
Container(
margin: EdgeInsets.only(left: 5),
child: Text('SAR',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
],
),
SizedBox(
height: 5,),
Row(
children: [
Container(
child: Text('12',
style: TextStyle(fontSize: 14.0,
),
),
),
Container(
margin: EdgeInsets.only(left: 5),
child: Text('items(s)',
style: TextStyle(fontSize: 14.0,
),
),
),
],
),
],
),
),
],
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 8,
indent: 0,
endIndent: 0,
),
],
),
),
);
}
)
],
),
),
);
}
Widget getCancelledOrder(){
return Container(
child: SingleChildScrollView(
child: Column(
children:<Widget> [
ListView.builder(
scrollDirection: Axis.vertical,
shrinkWrap: true,
physics: ScrollPhysics(),
itemCount: 2 ,
itemBuilder: (context, index){
return Container(
child: SingleChildScrollView(
child: Column(
children:<Widget> [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children:<Widget> [
Container(
margin: EdgeInsets.all( 8.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children:<Widget> [
Row(
children: [
Container(
margin: EdgeInsets.only(right: 5),
child: Text('Order#:',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
Container(
child: Text('3183',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
],
),
SizedBox(
height: 5,),
Row(
children: [
Container(
margin: EdgeInsets.only(right: 5),
child: Text('Date',
style: TextStyle(fontSize: 14.0,
),
),
),
Container(
child: Text('Aug 12, 2020',
style: TextStyle(fontSize: 14.0,
),
),
),
],
),
],
),
),
Container(
margin: EdgeInsets.all(8.0),
child: InkWell(
onTap: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) => OrderDetailsPage()));
},
child: SvgPicture.asset(
'assets/images/pharmacy/arrow_right.svg',
height: 20,
width: 20,),
),
),
],
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 1,
indent: 0,
endIndent: 0,
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Container(
margin: EdgeInsets.only(left: 8, right: 8, top: 1, bottom: 8),
padding: EdgeInsets.only(left: 10.0, right: 10.0),
decoration: BoxDecoration(
border: Border.all(
color: Colors.red[900],
style: BorderStyle.solid,
width: 5.0,
),
color: Colors.red[900],
borderRadius: BorderRadius.circular(30.0)
),
child: Text(
TranslationBase.of(context).cancelled,
style: TextStyle(
color: Colors.white,
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
),
),
Container(
margin: EdgeInsets.only(left: 8, right: 8, top: 1, bottom: 8),
child: Column(
// crossAxisAlignment: CrossAxisAlignment.end,
children:<Widget> [
Row(
children: [
Container(
margin: EdgeInsets.only(left: 5),
child: Text('564',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
Container(
margin: EdgeInsets.only(left: 5),
child: Text('SAR',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
],
),
SizedBox(
height: 5,),
Row(
children: [
Container(
child: Text('12',
style: TextStyle(fontSize: 14.0,
),
),
),
Container(
margin: EdgeInsets.only(left: 5),
child: Text('items(s)',
style: TextStyle(fontSize: 14.0,
),
),
),
],
),
],
),
),
],
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 8,
indent: 0,
endIndent: 0,
),
],
),
),
);
}
)
],
),
),
);
}
}
getOrder() {
print("getOrder no4665");
OrderService service = new OrderService();
service.getOrder(AppGlobal.context).then((res) {
print(res);
});
}
// filterOrders() {
// for () {
// if (order.order_status_id === 30 || order.order_status_id === 997 || order.order_status_id === 994) { // complete
// this.delivered.push(order);
// } else if (order.order_status_id === 40 || order.order_status_id === 200 || order.order_status_id === 996) { // cancelled & order refunded
// this.cancelled.push(order);
// } else if (order.order_status_id === 10) { // Pending
// this.pending.push(order);
// } else if (order.order_status_id === 20 || order.order_status_id === 995 || order.order_status_id === 998 || order.order_status_id === 999) { // Processing
// this.processing.push(order);
// } else { // Processing & other all other status
// this.other.push(order);
// }
// }
//}

@ -0,0 +1,467 @@
import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:diplomaticquarterapp/widgets//pharmacy/product_tile.dart';
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/services/pharmacy_services/orderDetails_service.dart';
class OrderDetailsPage extends StatefulWidget {
@override
_OrderDetailsPageState createState() => _OrderDetailsPageState();
}
class _OrderDetailsPageState extends State<OrderDetailsPage> {
AppSharedPreferences sharedPref = AppSharedPreferences();
@override
void initState() {
WidgetsBinding.instance.addPostFrameCallback((_) => getOrderDetails());
super.initState();
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
centerTitle: true,
title: Text(TranslationBase.of(context).orderDetail, style: TextStyle(color:Colors.white)),
backgroundColor: Colors.green,
),
body: Container(
color: Colors.white,
child: SingleChildScrollView(
child: Column(
children:<Widget> [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children:<Widget> [
Container(
margin: EdgeInsets.fromLTRB(10.0, 15.0, 1.0, 5.0),
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/shipping_mark_icon.svg',
width: 28,
height: 28,),
Text(TranslationBase.of(context).shippingAddress,
style: TextStyle(fontSize: 13.0, fontWeight: FontWeight.bold,
),
),
],
),
),
Container(
margin: EdgeInsets.only(top: 15.0, right: 10.0),
padding: EdgeInsets.only(left: 11.0, right: 11.0),
decoration: BoxDecoration(
border: Border.all(
color: Colors.blue,
style: BorderStyle.solid,
width: 5.0,
),
color: Colors.blue,
borderRadius: BorderRadius.circular(30.0)
),
child: Text(
TranslationBase.of(context).delivered,
style: TextStyle(
color: Colors.white,
fontSize: 13.0,
fontWeight: FontWeight.bold,
),
),
),
],
),
Container(
margin: EdgeInsets.only(left: 10.0, top: 13.0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children:<Widget> [
Text('NAME',
style: TextStyle(fontSize: 15.0, fontWeight: FontWeight.bold,
),
),
],
),
),
Container(
margin: EdgeInsets.fromLTRB(10.0, 5.0, 1.0, 5.0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children:<Widget> [
Text('Cloud Solutions',
style: TextStyle(fontSize: 15.0, fontWeight: FontWeight.bold,
color: Colors.grey,
),
),
],
),
),
Row(
children:<Widget> [
Container(
margin: EdgeInsets.fromLTRB(10.0, 5.0, 8.0, 5.0),
child: SvgPicture.asset(
'assets/images/pharmacy/mobile_number_icon.svg',
height: 13,),
),
Container(
margin: EdgeInsets.only(top: 5.0, bottom: 5.0),
child: Text('588888778',
style: TextStyle(fontSize: 15.0,
),
),
),
],
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 1,
indent: 0,
endIndent: 0,
),
Row(
children:<Widget> [
Container(
margin: EdgeInsets.fromLTRB(10.0, 10.0, 5.0, 10.0),
child: SvgPicture.asset(
'assets/images/pharmacy/shipping_truck_icon.svg',
height: 20,
width: 20,),
),
Container(
margin: EdgeInsets.all(10.0),
child:Text(TranslationBase.of(context).shippedMethod,
style: TextStyle(fontSize: 13.0, fontWeight: FontWeight.bold,
),
),
),
Container(
margin: EdgeInsets.only(bottom: 10.0, top: 10.0),
child: SvgPicture.asset(
'assets/images/pharmacy/hmg_shipping_logo.svg',
height: 25,
width: 25,),
),
],
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 8,
indent: 0,
endIndent: 0,
),
Row(
children:<Widget> [
Container(
margin: EdgeInsets.fromLTRB(10.0, 10.0, 1.0, 10.0),
child: SvgPicture.asset(
'assets/images/pharmacy/credit_card_icon.svg',
height: 20,
width: 20,),
),
Container(
margin: EdgeInsets.all(10.0),
child: SvgPicture.asset(
'assets/images/pharmacy/credit_card_icon.svg',
height: 20,
width: 20,),
),
Container(
margin: EdgeInsets.only(bottom: 10.0, top: 10.0),
child:Text('Mada',
style: TextStyle(fontSize: 13.0, fontWeight: FontWeight.bold,
),
),
),
],
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 8,
indent: 0,
endIndent: 0,
),
Container(
padding: EdgeInsets.only(bottom: 15.0),
margin: EdgeInsets.only(left: 10.0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(TranslationBase.of(context).orderDetail,
style: TextStyle(fontSize: 15.0, fontWeight: FontWeight.bold,
),
),
],
),
),
Container(
child: productTile(productName: 'Panadol Extra 500 MG', productPrice: '10.00', productRate: 3.00,
productReviews:4, totalPrice: '10.00', qyt: '3',),
),
Container(
padding: EdgeInsets.only(bottom: 10.0),
margin: EdgeInsets.only(left: 10.0, top: 5.0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(TranslationBase.of(context).orderSummary,
style: TextStyle(fontSize: 15.0, fontWeight: FontWeight.bold,
),
),
],
),
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children:<Widget> [
Container(
padding: EdgeInsets.only(bottom: 10.0),
margin: EdgeInsets.only(top: 5.0, left: 10.0 ),
child: Text(
TranslationBase.of(context).subtotal,
style: TextStyle(
fontSize: 13.0,
),
),
),
Container(
padding: EdgeInsets.only(bottom: 10.0),
margin: EdgeInsets.fromLTRB(10.0, 5.0, 5.0, 5.0),
child: Row(
children: <Widget>[
Container(
margin: EdgeInsets.only(right: 5.0),
child: Text(TranslationBase.of(context).sar,
style: TextStyle(fontSize: 13.0,
),
),
),
Text('343.55',
style: TextStyle(fontSize: 13.0,
),
),
],
),
),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children:<Widget> [
Container(
padding: EdgeInsets.only(bottom: 10.0),
margin: EdgeInsets.only(top: 5.0, left: 10.0 ),
child: Text(
TranslationBase.of(context).shipping,
style: TextStyle(
fontSize: 13.0,
),
),
),
Container(
padding: EdgeInsets.only(bottom: 10.0),
margin: EdgeInsets.fromLTRB(10.0, 5.0, 5.0, 5.0),
child: Row(
children: <Widget>[
Container(
margin: EdgeInsets.only(right: 5.0),
child: Text(TranslationBase.of(context).sar,
style: TextStyle(fontSize: 13.0,
),
),
),
Text('343.55',
style: TextStyle(fontSize: 13.0,
),
),
],
),
),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children:<Widget> [
Container(
padding: EdgeInsets.only(bottom: 10.0),
margin: EdgeInsets.only(top: 5.0,left: 10.0 ),
child: Text(
TranslationBase.of(context).vat,
style: TextStyle(
fontSize: 13.0,
),
),
),
Container(
padding: EdgeInsets.only(bottom: 10.0),
margin: EdgeInsets.fromLTRB(10.0, 5.0, 5.0, 5.0),
child: Row(
children: <Widget>[
Container(
margin: EdgeInsets.only(right: 5.0),
child: Text(TranslationBase.of(context).sar,
style: TextStyle(fontSize: 13.0,
),
),
),
Text('343.55',
style: TextStyle(fontSize: 13.0,
),
),
],
),
),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children:<Widget> [
Container(
margin: EdgeInsets.only(top: 5.0,left: 10.0 ),
child: Text(
TranslationBase.of(context).total,
style: TextStyle(
fontSize: 15.0,fontWeight: FontWeight.bold,
),
),
),
Container(
margin: EdgeInsets.fromLTRB(10.0, 5.0, 5.0, 5.0),
child: Row(
children: <Widget>[
Container(
margin: EdgeInsets.only(right: 5.0),
child: Text(TranslationBase.of(context).sar,
style: TextStyle(fontSize: 15.0,fontWeight: FontWeight.bold,
),
),
),
Text('343.55',
style: TextStyle(fontSize: 15.0, fontWeight: FontWeight.bold,
),
),
],
),
),
],
),
InkWell(
onTap: (){
},
child: Container(
margin: EdgeInsets.only(top: 20.0),
height: 50.0,
color: Colors.transparent,
child: Container(
decoration: BoxDecoration(
border: Border.all(
color: Colors.green,
style: BorderStyle.solid,
width: 1.0
),
color: Colors.green,
borderRadius: BorderRadius.circular(5.0)
),
child: Center(
child: Text(
TranslationBase.of(context).payOnline,
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
),
),
),
),
),
),
InkWell(
onTap: () {
// confirmDelete(snapshot.data[index]["id"]);
cancelOrder("id");
},
child: Container(
height: 50.0,
color: Colors.transparent,
child: Center(
child: Text(
TranslationBase.of(context).cancelOrder,
style: TextStyle(
color: Colors.red[900],
fontWeight: FontWeight.bold,
decoration: TextDecoration.underline
),
),
),
),
),
],
),
),
),
);
}
cancelOrder(id){
showDialog(
context: context,
builder: (BuildContext context)=> AlertDialog(
title: Text(TranslationBase.of(context).confirm,
style: TextStyle(
fontWeight: FontWeight.bold,
),),
content: Text(TranslationBase.of(context).confirmCancellation,
style: TextStyle(
color: Colors.grey,
),),
actions:[
FlatButton(
child: Text(TranslationBase.of(context).cancel,
style: TextStyle(
color: Colors.red,
fontWeight: FontWeight.bold,
fontSize: 16,
),),
onPressed: (){
Navigator.pop(context);
},
),
FlatButton(
child: Text(TranslationBase.of(context).ok,
style: TextStyle(
color: Colors.grey,
fontWeight: FontWeight.bold,
fontSize: 16,
),),
onPressed: (){
// http.delete(""https://uat.hmgwebservices.com/epharmacy/api/orders/$id");
Navigator.push(context,
MaterialPageRoute(builder: (context)=> OrderDetailsPage()));
},
),
],
)
);
}
}
getOrderDetails() {
print("getOrderDetails 5466");
OrderDetailsService service = new OrderDetailsService();
service.getOrderDetails(AppGlobal.context).then((res) {
print(res);
});
}
getPayOrder(){
}

@ -0,0 +1,312 @@
import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/services/pharmacy_services/order_service.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/profile/profile.dart';
import 'package:rating_bar/rating_bar.dart';
import 'package:diplomaticquarterapp/widgets//pharmacy/product_tile.dart';
class ProductReviewPage extends StatefulWidget {
@override
_ProductReviewPageState createState() => _ProductReviewPageState();
}
class _ProductReviewPageState extends State<ProductReviewPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
centerTitle: true,
title: Text(TranslationBase.of(context).writeReview, style: TextStyle(color:Colors.white)),
backgroundColor: Colors.green,
),
body: Container(
color: Colors.white,
child: SingleChildScrollView(
child: Column(
children: <Widget> [
// Container(
// child: productTile(productName: 'Panadol Extra 500 MG', productPrice: '10.00', productRate: 3.00,
// productReviews:4, ),
// ),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Container(
margin: EdgeInsets.only(left: 10),
child: Image(
image:
AssetImage('assets/images/al-habib_onlne_pharmacy_bg.png'),
fit: BoxFit.cover,
width: 80,
height: 80,
),
),
Container(
margin: EdgeInsets.only(top :15.0, bottom: 15.0),
child: Column(
children: <Widget>[
Row(
children: <Widget>[
Text('medication name',
style: TextStyle(fontSize: 16.0,
),
),
],
),
Row(
children: [
Container(
margin: EdgeInsets.only(left: 5),
child: Text('90.00',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
Container(
margin: EdgeInsets.only(left: 5),
child: Text('SAR',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold,
),
),
),
],
),
Row(
children: [
Container(
margin: EdgeInsets.all(5),
child: Align(
alignment: Alignment.topLeft,
child: RatingBar.readOnly(
initialRating: 3,
size: 15.0,
filledColor: Colors.yellow[700],
emptyColor: Colors.grey[500],
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: Icons.star,
emptyIcon: Icons.star,
),
),
),
Container(
child: Text('4.9',
style: TextStyle(fontSize: 14.0, fontWeight: FontWeight.bold,
),
),
),
Container(
margin: EdgeInsets.only(left: 5),
child: Text('10 (reviews)',
style: TextStyle(fontSize: 12.0,
),
),
),
],
),
],
),
),
],
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 8,
indent: 0,
endIndent: 0,
),
Container(
margin: EdgeInsets.only( top: 12.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.max,
children: <Widget>[
RatingBar(
// initialRating:
// this.doctor.actualDoctorRate.toDouble(),
size: 40.0,
filledColor: Colors.yellow[700],
emptyColor: Colors.grey[500],
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: Icons.star,
emptyIcon: Icons.star,
),
],
),
),
Container(
padding: EdgeInsets.fromLTRB(8.0, 20.0, 8.0,20.0),
child: Column(
children:<Widget> [
TextFormField (
decoration: InputDecoration(
contentPadding: const EdgeInsets.symmetric(vertical: 60.0),
border: InputBorder.none,
hintText: 'Tell us more about product!',
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(5.0),
borderSide: BorderSide(width: 1, color: Colors.grey[400]),
),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(5.0)),
borderSide: BorderSide(color: Colors.grey[400], width: 1),
),
),
),
],
),
),
InkWell(
onTap: () {
},
child: Container(
height: 50.0,
width: 400.0,
color: Colors.transparent,
child: Container(
decoration: BoxDecoration(
border: Border.all(
color: Colors.yellow[700],
style: BorderStyle.solid,
width: 1.0
),
color: Colors.yellow[700],
borderRadius: BorderRadius.circular(5.0)
),
child: Center(
child: Text(
TranslationBase.of(context).shareReview,
style: TextStyle(
color: Colors.white,
fontSize: 16.0,
fontWeight: FontWeight.bold,
),
),
),
),
),
),
],
),
),
),
);
}
//new screen is showing after submitting the review
Widget getReviewedProduct(){
return Column(
mainAxisAlignment: MainAxisAlignment.center,
children:<Widget> [
Row(
mainAxisAlignment: MainAxisAlignment.center,
children:<Widget> [
SvgPicture.asset(
'assets/images/pharmacy/check_icon.svg',
width: 28,
height: 28,),
Container(
margin: EdgeInsets.only(left: 10.0),
child: Text(TranslationBase.of(context).reviewSuccessful,
style: TextStyle(fontSize: 20.0, fontWeight: FontWeight.bold,
),
),
),
],
),
Container(
margin: EdgeInsets.only(top:5.0, bottom: 20.0 ),
child: Text(TranslationBase.of(context).reviewShared,
style: TextStyle(fontSize: 15.0,
),
),
),
Container(
margin: EdgeInsets.only(bottom: 30.0, top: 30.0 ),
child: SvgPicture.asset(
'assets/images/pharmacy/success_review_icon.svg',
width: 100,
height: 100,),
),
Container(
margin: EdgeInsets.only(left: 20.0, right: 20.0),
child: Column(
children:<Widget> [
Row(
mainAxisAlignment: MainAxisAlignment.start,
children:<Widget> [
SvgPicture.asset(
'assets/images/pharmacy/quote_start.svg',
width: 15,
height: 15,),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children:<Widget> [
Text(TranslationBase.of(context).reviewComment,
style: TextStyle(fontSize: 15.0,
),
),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children:<Widget> [
SvgPicture.asset(
'assets/images/pharmacy/quote_end.svg',
width: 15,
height: 15,),
],
),
],
),
),
Container(
margin: EdgeInsets.only(top: 20.0 ),
child: InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) {
return PharmacyProfilePage();
}),
);
},
child: Container(
height: 50.0, color: Colors.transparent,
child: Container(
decoration: BoxDecoration(
border: Border.all(
color: Colors.orange,
style: BorderStyle.solid,
width: 1.0
),
color: Colors.transparent,
borderRadius: BorderRadius.circular(5.0)
),
child: Center(
child: Text(
TranslationBase.of(context).backMyAccount,
style: TextStyle(
color: Colors.orange,
fontWeight: FontWeight.bold,
),
),
),
),
),
),
),
],
);
}
}

@ -1,8 +1,8 @@
import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart';
import 'package:flutter/material.dart';
import 'package:flutter_html/style.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
class AddAddressPage extends StatefulWidget {
@override
@ -10,48 +10,118 @@ class AddAddressPage extends StatefulWidget {
}
class _AddAddressState extends State<AddAddressPage> {
void onMapCreated(controller){
setState(() {
mapController= controller;
});
}
void _getAddressFromLatLng() {}
_onMapTypeButtonPressed(){}
_onAddMarkerButtonPressed(){}
LatLng _initialPosition;
GoogleMapController mapController;
@override
void initState() {
// TODO: implement initState
_initialPosition = LatLng(24.662617030, 46.7334844);
super.initState();
}
void _onMapCreated(GoogleMapController controller) {
mapController = controller;
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
centerTitle: true,
title: Text(TranslationBase.of(context).addNewAddress, style: TextStyle(color:Colors.white)),
backgroundColor: Colors.green,
title: Text(TranslationBase.of(context).addNewAddress, style: TextStyle(color:Colors.white)),
backgroundColor: Colors.green,
),
body: Container(
child: Column(
children: <Widget> [
Container(
),
Container(
height: 50.0,
width: 400.0,
color: Colors.transparent,
child: Container(
decoration: BoxDecoration(
border: Border.all(
color: Colors.green,
style: BorderStyle.solid,
width: 1.0
),
color: Colors.green,
borderRadius: BorderRadius.circular(10.0)
),
child: Center(
child: Text(
TranslationBase.of(context).save,
style: TextStyle(
color: Colors.white,
fontSize: 20.0,
fontWeight: FontWeight.bold,
),
),
body: Stack(
children: <Widget> [
GoogleMap(
zoomControlsEnabled: true,
myLocationButtonEnabled: true,
myLocationEnabled: true,
onMapCreated: _onMapCreated,
onCameraMove: (object) {
// widget.currentLat = object.target.latitude;
// widget.currentLong = object.target.longitude;
},
onCameraIdle: _getAddressFromLatLng,
padding: EdgeInsets.only(bottom: 90.0),
initialCameraPosition: CameraPosition(
target: _initialPosition,
zoom: 13.0,
),
),
Align(
alignment: Alignment.topRight,
child: Column(
children:<Widget> [
button(_onMapTypeButtonPressed,Icons.map),
SizedBox(
height:16.0,
),
),
button(_onAddMarkerButtonPressed, Icons.add_location)
],
),
],
),
]
),
),
bottomSheet: InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) {
return AddAddressPage();
}),
);
},
child: Container(
height: 50.0,
color: Colors.green,
child: Container(
decoration: BoxDecoration(
border: Border.all(
color: Colors.green,
style: BorderStyle.solid,
width: 1.0
),
color: Colors.green,
borderRadius: BorderRadius.circular(10.0)
),
child: Center(
child: Text(TranslationBase.of(context).confirmLocation,
style: TextStyle(
color: Colors.white,
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
),
),
),
),
),
);
}}
}
Widget button(Function function, IconData icon){
return FloatingActionButton(
onPressed: function,
materialTapTargetSize: MaterialTapTargetSize.padded,
backgroundColor: Colors.red,
child: Icon(
icon,
size: 18.0,
),);
}
}

@ -4,7 +4,9 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/AddAddress.dart';
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/services/pharmacy_services/pharmacyAddress_service.dart';
class PharmacyAddressesPage extends StatefulWidget{
@override
@ -15,8 +17,14 @@ class _PharmacyAddressesState extends State<PharmacyAddressesPage>{
int selectedRadio;
bool _value = false;
AppSharedPreferences sharedPref = AppSharedPreferences();
@override
void initState(){
WidgetsBinding.instance.addPostFrameCallback((_) => getAllAddress());
super.initState();
selectedRadio=0;
}
@ -41,11 +49,11 @@ class _PharmacyAddressesState extends State<PharmacyAddressesPage>{
scrollDirection: Axis.vertical,
shrinkWrap: true,
physics: ScrollPhysics(),
itemCount: 2 ,
itemCount: 5 ,
itemBuilder: (context, index){
return Container(
child: Padding(
padding:EdgeInsets.only(top:20.0, left:5.0, right:5.0, bottom:5.0,),
padding:EdgeInsets.only(top:10.0, left:5.0, right:5.0, bottom:5.0,),
child: Column(
children: [
Row(
@ -174,6 +182,10 @@ class _PharmacyAddressesState extends State<PharmacyAddressesPage>{
Column(
children: <Widget> [
InkWell(
onTap: () {
// confirmDelete(snapshot.data[index]["id"]);
confirmDelete("address");
},
child: Row(
children:<Widget> [
Container(
@ -230,6 +242,7 @@ class _PharmacyAddressesState extends State<PharmacyAddressesPage>{
);
},
child: Container(
margin: EdgeInsets.only(bottom: 100.0),
height: 50.0,
color: Colors.transparent,
child: Container(
@ -258,8 +271,99 @@ class _PharmacyAddressesState extends State<PharmacyAddressesPage>{
),
),
),
bottomSheet: InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) {
return AddAddressPage();
}),
);
},
child: Container(
height: 50.0,
color: Colors.green,
child: Container(
decoration: BoxDecoration(
border: Border.all(
color: Colors.green,
style: BorderStyle.solid,
width: 1.0
),
color: Colors.green,
borderRadius: BorderRadius.circular(5.0)
),
child: Center(
child: Text(TranslationBase.of(context).confirmAddress,
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
),
),
),
),
),
),
);
}
confirmDelete(address){
showDialog(
context: context,
builder: (BuildContext context)=> AlertDialog(
title: Text(TranslationBase.of(context).confirmDeleteMsg,
style: TextStyle(
fontWeight: FontWeight.bold,
),),
content: Text("address"),
actions:[
FlatButton(
child: Text(TranslationBase.of(context).cancel,
style: TextStyle(
color: Colors.red,
fontWeight: FontWeight.bold,
fontSize: 16,
),),
onPressed: (){
Navigator.pop(context);
},
),
FlatButton(
child: Text(TranslationBase.of(context).confirmDelete,
style: TextStyle(
color: Colors.grey,
fontWeight: FontWeight.bold,
fontSize: 16,
),),
onPressed: (){
// http.delete("https://uat.hmgwebservices.com/epharmacy/api/Customers/272843?fields=addresses/$id");
Navigator.push(context,
MaterialPageRoute(builder: (context)=> PharmacyAddressesPage() ));
},
),
],
)
);
}
}
getAllAddress() {
print("ADDRESSES");
PharmacyAddressService service = new PharmacyAddressService();
service.getAddress(AppGlobal.context).then((res) {
print(res);
});
}
getConfirmAddress(){
}
getEditAddress(){
}
getDeleteAddress(){
}

@ -0,0 +1,39 @@
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/service/base_service.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:flutter/material.dart';
class OrderDetailsService extends BaseService{
AppSharedPreferences sharedPref = AppSharedPreferences();
AppGlobal appGlobal = new AppGlobal();
AuthenticatedUser authUser = new AuthenticatedUser();
AuthProvider authProvider = new AuthProvider();
Future<Map> getOrderDetails(BuildContext context ) async {
if (await this.sharedPref.getObject(USER_PROFILE) != null) {
var data = AuthenticatedUser.fromJson(
await this.sharedPref.getObject(USER_PROFILE));
authUser = data;
}
dynamic localRes;
String URL;
URL = GET_ORDER_DETAILS;
await baseAppClient.get(URL,
onSuccess: (response, statusCode) async {
localRes = response;
}, onFailure: (String error, int statusCode) {
throw error;
});
return Future.value(localRes);
}
}

@ -0,0 +1,38 @@
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/service/base_service.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:flutter/material.dart';
class OrderService extends BaseService{
AppSharedPreferences sharedPref = AppSharedPreferences();
AppGlobal appGlobal = new AppGlobal();
AuthenticatedUser authUser = new AuthenticatedUser();
AuthProvider authProvider = new AuthProvider();
Future<Map> getOrder(BuildContext context ) async {
if (await this.sharedPref.getObject(USER_PROFILE) != null) {
var data = AuthenticatedUser.fromJson(
await this.sharedPref.getObject(USER_PROFILE));
authUser = data;
}
dynamic localRes;
String URL;
URL = GET_ORDER;
await baseAppClient.get(URL,
onSuccess: (response, statusCode) async {
localRes = response;
}, onFailure: (String error, int statusCode) {
throw error;
});
return Future.value(localRes);
}
}

@ -0,0 +1,40 @@
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/service/base_service.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:flutter/material.dart';
class PharmacyAddressService extends BaseService{
AppSharedPreferences sharedPref = AppSharedPreferences();
AppGlobal appGlobal = new AppGlobal();
AuthenticatedUser authUser = new AuthenticatedUser();
AuthProvider authProvider = new AuthProvider();
Future<Map> getAddress(BuildContext context ) async {
if (await this.sharedPref.getObject(USER_PROFILE) != null) {
var data = AuthenticatedUser.fromJson(
await this.sharedPref.getObject(USER_PROFILE));
authUser = data;
}
dynamic localRes;
String URL;
// URL = GET_ADDRESS+'272843?fields=addresses';
URL = GET_ADDRESS;
await baseAppClient.get(URL,
onSuccess: (response, statusCode) async {
localRes = response;
}, onFailure: (String error, int statusCode) {
throw error;
});
return Future.value(localRes);
}
}

@ -709,6 +709,33 @@ class TranslationBase {
String get addAddress => localizedValues['addAddress'][locale.languageCode];
String get addNewAddress =>
localizedValues['addNewAddress'][locale.languageCode];
String get order => localizedValues['order'][locale.languageCode];
String get delivered => localizedValues['delivered'][locale.languageCode];
String get processing => localizedValues['processing'][locale.languageCode];
String get pending => localizedValues['pending'][locale.languageCode];
String get cancelled => localizedValues['cancelled'][locale.languageCode];
String get writeReview => localizedValues['writeReview'][locale.languageCode];
String get shareReview => localizedValues['shareReview'][locale.languageCode];
String get backMyAccount => localizedValues['backMyAccount'][locale.languageCode];
String get reviewSuccessful => localizedValues['reviewSuccessful'][locale.languageCode];
String get reviewShared => localizedValues['reviewShared'][locale.languageCode];
String get reviewComment => localizedValues['reviewComment'][locale.languageCode];
String get shippingAddress => localizedValues['shippingAddress'][locale.languageCode];
String get shippedMethod => localizedValues['shippedMethod'][locale.languageCode];
String get orderDetail => localizedValues['orderDetail'][locale.languageCode];
String get orderSummary => localizedValues['orderSummary'][locale.languageCode];
String get subtotal => localizedValues['subtotal'][locale.languageCode];
String get shipping => localizedValues['shipping'][locale.languageCode];
String get vat => localizedValues['vat'][locale.languageCode];
String get total => localizedValues['total'][locale.languageCode];
String get sar => localizedValues['sar'][locale.languageCode];
String get payOnline => localizedValues['payOnline'][locale.languageCode];
String get cancelOrder => localizedValues['cancelOrder'][locale.languageCode];
String get confirmAddress => localizedValues['confirmAddress'][locale.languageCode];
String get confirmLocation => localizedValues['confirmLocation'][locale.languageCode];
String get confirmDeleteMsg => localizedValues['confirmDeleteMsg'][locale.languageCode];
String get confirmDelete => localizedValues['confirmDelete'][locale.languageCode];
String get confirmCancellation => localizedValues['confirmCancellation'][locale.languageCode];
}
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -1,7 +1,10 @@
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';
@ -9,13 +12,20 @@ class productTile extends StatelessWidget {
final String productName;
final String productPrice;
final double productRate;
final int productReviews;
final String qyt;
final String totalPrice;
final bool isOrderDetails;
productTile({this.productName, this.productPrice, this.productRate});
productTile({this.productName, this.productPrice, this.productRate,
this.qyt, this.totalPrice, this.productReviews,
this.isOrderDetails=true});
@override
Widget build(BuildContext context) {
return Container(
height: 120,
height: 150,
width: double.infinity,
color: Colors.white,
child: Column(
@ -69,7 +79,7 @@ class productTile extends StatelessWidget {
),
),
),
Container(
this.isOrderDetails == false ? Container(
margin: EdgeInsets.all(5),
child: Align(
alignment: Alignment.topLeft,
@ -84,22 +94,135 @@ class productTile extends StatelessWidget {
emptyIcon: Icons.star,
),
),
),
): Container(),
],
),
),
Expanded(
this.isOrderDetails == false ? Expanded(
flex: 1,
child: Column(
child: Column (
children: [
Icon(FontAwesomeIcons.trashAlt, size: 15),
SizedBox(height: 50,),
Icon(FontAwesomeIcons.shoppingCart, size: 15),
],
),
),
) : Container(),
],
),
this.isOrderDetails == true ?Expanded(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Container(
// margin: EdgeInsets.all(5),
child: RichText(
text: TextSpan(
text: 'QYT: $qyt',
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.grey,
fontSize: 13),
),
),
),
Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Text(
TranslationBase.of(context).total,
style: TextStyle(
color: Colors.grey,
fontSize: 13.0,
fontWeight: FontWeight.bold,
),
),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
RichText(
text: TextSpan(
text: ' $totalPrice SAR',
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.black,
fontSize: 15),
),
),
],
),
],
),
],
),
): Container(),
this.isOrderDetails == true ?Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
Container(
margin: EdgeInsets.all(5),
child: Align(
alignment: Alignment.topLeft,
child: RatingBar.readOnly(
initialRating: productRate,
size: 15.0,
filledColor: Colors.yellow[700],
emptyColor: Colors.grey[500],
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: Icons.star,
emptyIcon: Icons.star,
),
),
),
Container(
margin: EdgeInsets.all(5),
child: Align(
alignment: Alignment.topLeft,
child: RichText(
text: TextSpan(
text: '($productReviews reviews)',
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.grey,
fontSize: 13),
),
),
),
),
InkWell(
onTap: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) => ProductReviewPage()));
},
child: Container(
padding: EdgeInsets.only(left: 13.0, right: 13.0, top: 5.0),
height: 30.0,
decoration: BoxDecoration(
border: Border.all(
color: Colors.orange,
style: BorderStyle.solid,
width: 1.0
),
color: Colors.transparent,
borderRadius: BorderRadius.circular(5.0)
),
child: Text(
TranslationBase.of(context).writeReview,
style: TextStyle(
fontSize:12,
color: Colors.orange,
),
),
),
),
],
) : Container(),
],
),
);

@ -138,6 +138,9 @@ dependencies:
#google maps places
google_maps_place_picker: ^0.10.0
#google maps places
google_maps_flutter: ^0.5.28+1
#Dependencies for video call implementation
native_device_orientation: ^0.3.0
enum_to_string: ^1.0.9

Loading…
Cancel
Save