Skip to content

GitLab

Commit b5225d58 authored by Sai Srinivas's avatar Sai Srinivas
Browse files

07-08-2025 By Sai Srinivas 

Finance Test cases and Order Module
parent a5820eb1
Show whitespace changes
Inline Side-by-side
assets/svg/finance/level_add_payment_ic.svg 0 → 100644
View file @ b5225d58
<svg width="24" height="17" viewBox="0 0 24 17" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.6972 6.16745H0.333984V12.8341C0.333984 13.6117 0.643318 14.3584 1.19265 14.9088C1.74305 15.4581 2.48972 15.7674 3.26732 15.7674H13.5521C12.6273 14.6933 12.0673 13.2949 12.0673 11.7674C12.0673 9.27358 13.5585 7.12638 15.6972 6.16745ZM7.53505 10.9674H4.33398C3.89238 10.9674 3.53398 11.3258 3.53398 11.7674C3.53398 12.209 3.89238 12.5674 4.33398 12.5674H7.53505C7.97665 12.5674 8.33505 12.209 8.33505 11.7674C8.33505 11.3258 7.97665 10.9674 7.53505 10.9674ZM0.333984 4.56745H21.134V3.23411C21.134 2.45651 20.8246 1.70985 20.2753 1.15945C19.7249 0.610114 18.9782 0.300781 18.2006 0.300781C14.5068 0.300781 6.96118 0.300781 3.26732 0.300781C2.48972 0.300781 1.74305 0.610114 1.19265 1.15945C0.643318 1.70985 0.333984 2.45651 0.333984 3.23411V4.56745Z" fill="black"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.6972 6.16745H0.333984V12.8341C0.333984 13.6117 0.643318 14.3584 1.19265 14.9088C1.74305 15.4581 2.48972 15.7674 3.26732 15.7674H13.5521C12.6273 14.6933 12.0673 13.2949 12.0673 11.7674C12.0673 9.27358 13.5585 7.12638 15.6972 6.16745ZM7.53505 10.9674H4.33398C3.89238 10.9674 3.53398 11.3258 3.53398 11.7674C3.53398 12.209 3.89238 12.5674 4.33398 12.5674H7.53505C7.97665 12.5674 8.33505 12.209 8.33505 11.7674C8.33505 11.3258 7.97665 10.9674 7.53505 10.9674ZM0.333984 4.56745H21.134V3.23411C21.134 2.45651 20.8246 1.70985 20.2753 1.15945C19.7249 0.610114 18.9782 0.300781 18.2006 0.300781C14.5068 0.300781 6.96118 0.300781 3.26732 0.300781C2.48972 0.300781 1.74305 0.610114 1.19265 1.15945C0.643318 1.70985 0.333984 2.45651 0.333984 3.23411V4.56745Z" fill="url(#paint0_linear_73_4107)"/>
<path d="M22.9123 12.0673C22.9124 11.9694 22.8931 11.8723 22.8556 11.7818C22.8181 11.6913 22.7632 11.609 22.6939 11.5397C22.6246 11.4704 22.5424 11.4155 22.4518 11.378C22.3613 11.3405 22.2643 11.3213 22.1663 11.3213H19.6796L19.6802 8.8352C19.6802 8.63719 19.6016 8.44728 19.4616 8.30726C19.3216 8.16724 19.1317 8.08856 18.9337 8.08854C18.7356 8.08853 18.5457 8.16717 18.4057 8.30717C18.2657 8.44717 18.187 8.63706 18.187 8.83507L18.1875 11.3213L15.7011 11.3209C15.5032 11.321 15.3133 11.3996 15.1733 11.5397C15.0333 11.6797 14.9547 11.8696 14.9547 12.0676C14.9548 12.2656 15.0335 12.4554 15.1735 12.5954C15.3135 12.7354 15.5034 12.814 15.7014 12.814L18.1874 12.8135L18.1871 15.2997C18.1871 15.4977 18.2658 15.6875 18.4057 15.8275C18.5457 15.9675 18.7356 16.0461 18.9335 16.0461C19.1315 16.0461 19.3213 15.9675 19.4613 15.8275C19.6013 15.6875 19.6799 15.4977 19.6799 15.2997L19.6797 12.8135L22.1658 12.8139C22.2639 12.814 22.361 12.7947 22.4516 12.7572C22.5422 12.7198 22.6246 12.6648 22.6939 12.5954C22.7632 12.5261 22.8182 12.4438 22.8557 12.3531C22.8932 12.2625 22.9124 12.1654 22.9123 12.0673Z" fill="url(#paint1_linear_73_4107)"/>
<path d="M22.9123 12.0673C22.9124 11.9694 22.8931 11.8723 22.8556 11.7818C22.8181 11.6913 22.7632 11.609 22.6939 11.5397C22.6246 11.4704 22.5424 11.4155 22.4518 11.378C22.3613 11.3405 22.2643 11.3213 22.1663 11.3213H19.6796L19.6802 8.8352C19.6802 8.63719 19.6016 8.44728 19.4616 8.30726C19.3216 8.16724 19.1317 8.08856 18.9337 8.08854C18.7356 8.08853 18.5457 8.16717 18.4057 8.30717C18.2657 8.44717 18.187 8.63706 18.187 8.83507L18.1875 11.3213L15.7011 11.3209C15.5032 11.321 15.3133 11.3996 15.1733 11.5397C15.0333 11.6797 14.9547 11.8696 14.9547 12.0676C14.9548 12.2656 15.0335 12.4554 15.1735 12.5954C15.3135 12.7354 15.5034 12.814 15.7014 12.814L18.1874 12.8135L18.1871 15.2997C18.1871 15.4977 18.2658 15.6875 18.4057 15.8275C18.5457 15.9675 18.7356 16.0461 18.9335 16.0461C19.1315 16.0461 19.3213 15.9675 19.4613 15.8275C19.6013 15.6875 19.6799 15.4977 19.6799 15.2997L19.6797 12.8135L22.1658 12.8139C22.2639 12.814 22.361 12.7947 22.4516 12.7572C22.5422 12.7198 22.6246 12.6648 22.6939 12.5954C22.7632 12.5261 22.8182 12.4438 22.8557 12.3531C22.8932 12.2625 22.9124 12.1654 22.9123 12.0673Z" fill="url(#paint2_linear_73_4107)"/>
<defs>
<linearGradient id="paint0_linear_73_4107" x1="0.345133" y1="7.94751" x2="22.632" y2="24.3152" gradientUnits="userSpaceOnUse">
<stop stop-color="#FFC80B"/>
<stop offset="1" stop-color="#E89318"/>
</linearGradient>
<linearGradient id="paint1_linear_73_4107" x1="18.9335" y1="16.0454" x2="18.9335" y2="8.08955" gradientUnits="userSpaceOnUse">
<stop stop-color="#EF3739"/>
<stop offset="0.54" stop-color="#EF3739"/>
<stop offset="1" stop-color="#FF8C8B"/>
</linearGradient>
<linearGradient id="paint2_linear_73_4107" x1="15.862" y1="13.2839" x2="22.0993" y2="11.1221" gradientUnits="userSpaceOnUse">
<stop stop-color="#5BAF25"/>
<stop offset="1" stop-color="#89BD3D"/>
</linearGradient>
</defs>
</svg>
assets/svg/finance/level_approve_ic.svg 0 → 100644
View file @ b5225d58
<svg width="20" height="15" viewBox="0 0 20 15" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M18.4565 4.63375L9.41889 14.2176C8.99309 14.6692 8.39998 14.9248 7.78005 14.9248C7.77076 14.9248 7.76146 14.9248 7.75217 14.9248C7.12223 14.9169 6.52446 14.6456 6.10367 14.1765L1.34159 8.86779C0.510731 7.94183 0.587954 6.51785 1.51391 5.68699C2.43987 4.85648 3.86385 4.93335 4.69471 5.85931L7.82188 9.34507L15.1791 1.54305C16.0325 0.638183 17.4583 0.595997 18.3632 1.44974C19.268 2.30312 19.3099 3.72889 18.4565 4.63375Z" fill="#0D9C00"/>
</svg>
assets/svg/finance/level_delete_ic.svg 0 → 100644
View file @ b5225d58
<svg width="15" height="18" viewBox="0 0 15 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.3512 4.80859C9.19933 4.60605 5.04755 4.60605 0.89588 4.80859C0.356228 4.83356 -0.0530196 4.4205 0.00559303 3.90131C0.0298704 3.68559 0.053801 3.51253 0.0818935 3.29646C0.168252 2.64339 0.725938 2.07461 1.38906 1.96016C2.06362 1.84536 3.20952 1.72085 4.53402 1.64802C4.54512 1.50305 4.55657 1.35808 4.5687 1.21311C4.61726 0.664439 4.98489 0.21288 5.43333 0.149411C6.90835 -0.0517442 7.58361 -0.050357 9.05898 0.157041C9.50742 0.22259 9.87609 0.675191 9.92603 1.22317C9.93921 1.36952 9.95147 1.51588 9.9628 1.66224C11.1815 1.73507 12.2265 1.85264 12.8598 1.96016C13.5229 2.07461 14.0806 2.64339 14.1669 3.29646C14.195 3.51253 14.219 3.68559 14.2433 3.90131C14.3001 4.4205 13.8905 4.83356 13.3512 4.80859ZM13.1927 11.4675C13.0769 12.9863 12.9285 13.7219 12.7297 14.7162C12.5945 15.3922 12.2248 16.049 11.7031 16.5654C11.1815 17.0819 10.5399 17.4301 9.87713 17.5331L9.85667 17.5362C9.04823 17.6545 8.7732 17.7495 7.08211 17.7582C5.39101 17.7464 5.25992 17.6562 4.45079 17.539L4.43067 17.5358C3.76686 17.4335 3.12004 17.085 2.6005 16.5696C2.08096 16.0542 1.70466 15.396 1.56628 14.7197C1.36305 13.7253 1.20941 12.9887 1.08594 11.4689C0.981891 10.1569 0.963163 9.65714 0.996458 8.67668C1.00582 7.82766 1.02386 7.20373 1.03391 7.09102C1.08594 6.53263 1.55414 6.0731 2.13021 6.00512C3.0205 5.90108 4.86003 5.86084 6.75853 5.85356H7.03876H7.07517C9.12141 5.85009 11.1801 5.89379 12.1387 6.00651C12.7162 6.07587 13.183 6.53437 13.235 7.09275C13.2461 7.21344 13.2663 7.99101 13.2746 8.86153C13.3009 9.825 13.2829 10.2374 13.1927 11.4679V11.4675ZM6.00038 11.299C5.9983 10.87 5.98096 9.21043 5.96153 8.98223C5.94526 8.79807 5.86461 8.62554 5.73376 8.49495C5.60291 8.36435 5.43023 8.28404 5.24604 8.26812C5.01714 8.2487 5.02824 8.24905 4.95263 8.24939C4.85453 8.2505 4.75656 8.25722 4.65922 8.26951C4.47547 8.28577 4.30321 8.36585 4.17233 8.49584C4.04145 8.62584 3.9602 8.79755 3.94269 8.98119C3.92084 9.20801 3.91321 10.854 3.91946 11.2789C3.9257 11.7037 3.96038 13.3501 3.98605 13.5776C4.00657 13.7618 4.08841 13.9337 4.21842 14.0658C4.34844 14.1979 4.51907 14.2825 4.70292 14.3059C4.79852 14.3203 4.89487 14.3291 4.99148 14.3323C5.06258 14.3323 5.05495 14.334 5.27934 14.3184C5.46082 14.3043 5.63116 14.2253 5.75927 14.096C5.88738 13.9667 5.96471 13.7956 5.97714 13.614C5.99483 13.3882 6.00107 11.728 6.00038 11.2993V11.299ZM10.328 11.2792C10.3339 10.8537 10.3263 9.20835 10.3044 8.98153C10.2869 8.7979 10.2057 8.62618 10.0748 8.49619C9.9439 8.36619 9.77164 8.28612 9.58788 8.26986C9.35933 8.24939 9.37008 8.24974 9.29447 8.24974C9.19651 8.25033 9.09866 8.25659 9.00141 8.26847C8.81699 8.28422 8.64407 8.36462 8.51315 8.49547C8.38224 8.62631 8.30176 8.7992 8.28592 8.98361C8.26615 9.21182 8.24916 10.8714 8.24708 11.3004C8.245 11.7294 8.25228 13.3882 8.26997 13.6164C8.2824 13.798 8.35973 13.9691 8.48784 14.0984C8.61595 14.2278 8.78629 14.3067 8.96777 14.3208C9.06337 14.3311 9.15949 14.3358 9.25563 14.3347C9.35225 14.3316 9.4486 14.3228 9.54418 14.3083C9.72804 14.2849 9.89867 14.2004 10.0287 14.0683C10.1587 13.9362 10.2405 13.7642 10.2611 13.58C10.2871 13.3504 10.3256 11.7048 10.328 11.2792Z" fill="url(#paint0_linear_70_4106)"/>
<path d="M13.3512 4.80859C9.19933 4.60605 5.04755 4.60605 0.89588 4.80859C0.356228 4.83356 -0.0530196 4.4205 0.00559303 3.90131C0.0298704 3.68559 0.053801 3.51253 0.0818935 3.29646C0.168252 2.64339 0.725938 2.07461 1.38906 1.96016C2.06362 1.84536 3.20952 1.72085 4.53402 1.64802C4.54512 1.50305 4.55657 1.35808 4.5687 1.21311C4.61726 0.664439 4.98489 0.21288 5.43333 0.149411C6.90835 -0.0517442 7.58361 -0.050357 9.05898 0.157041C9.50742 0.22259 9.87609 0.675191 9.92603 1.22317C9.93921 1.36952 9.95147 1.51588 9.9628 1.66224C11.1815 1.73507 12.2265 1.85264 12.8598 1.96016C13.5229 2.07461 14.0806 2.64339 14.1669 3.29646C14.195 3.51253 14.219 3.68559 14.2433 3.90131C14.3001 4.4205 13.8905 4.83356 13.3512 4.80859ZM13.1927 11.4675C13.0769 12.9863 12.9285 13.7219 12.7297 14.7162C12.5945 15.3922 12.2248 16.049 11.7031 16.5654C11.1815 17.0819 10.5399 17.4301 9.87713 17.5331L9.85667 17.5362C9.04823 17.6545 8.7732 17.7495 7.08211 17.7582C5.39101 17.7464 5.25992 17.6562 4.45079 17.539L4.43067 17.5358C3.76686 17.4335 3.12004 17.085 2.6005 16.5696C2.08096 16.0542 1.70466 15.396 1.56628 14.7197C1.36305 13.7253 1.20941 12.9887 1.08594 11.4689C0.981891 10.1569 0.963163 9.65714 0.996458 8.67668C1.00582 7.82766 1.02386 7.20373 1.03391 7.09102C1.08594 6.53263 1.55414 6.0731 2.13021 6.00512C3.0205 5.90108 4.86003 5.86084 6.75853 5.85356H7.03876H7.07517C9.12141 5.85009 11.1801 5.89379 12.1387 6.00651C12.7162 6.07587 13.183 6.53437 13.235 7.09275C13.2461 7.21344 13.2663 7.99101 13.2746 8.86153C13.3009 9.825 13.2829 10.2374 13.1927 11.4679V11.4675ZM6.00038 11.299C5.9983 10.87 5.98096 9.21043 5.96153 8.98223C5.94526 8.79807 5.86461 8.62554 5.73376 8.49495C5.60291 8.36435 5.43023 8.28404 5.24604 8.26812C5.01714 8.2487 5.02824 8.24905 4.95263 8.24939C4.85453 8.2505 4.75656 8.25722 4.65922 8.26951C4.47547 8.28577 4.30321 8.36585 4.17233 8.49584C4.04145 8.62584 3.9602 8.79755 3.94269 8.98119C3.92084 9.20801 3.91321 10.854 3.91946 11.2789C3.9257 11.7037 3.96038 13.3501 3.98605 13.5776C4.00657 13.7618 4.08841 13.9337 4.21842 14.0658C4.34844 14.1979 4.51907 14.2825 4.70292 14.3059C4.79852 14.3203 4.89487 14.3291 4.99148 14.3323C5.06258 14.3323 5.05495 14.334 5.27934 14.3184C5.46082 14.3043 5.63116 14.2253 5.75927 14.096C5.88738 13.9667 5.96471 13.7956 5.97714 13.614C5.99483 13.3882 6.00107 11.728 6.00038 11.2993V11.299ZM10.328 11.2792C10.3339 10.8537 10.3263 9.20835 10.3044 8.98153C10.2869 8.7979 10.2057 8.62618 10.0748 8.49619C9.9439 8.36619 9.77164 8.28612 9.58788 8.26986C9.35933 8.24939 9.37008 8.24974 9.29447 8.24974C9.19651 8.25033 9.09866 8.25659 9.00141 8.26847C8.81699 8.28422 8.64407 8.36462 8.51315 8.49547C8.38224 8.62631 8.30176 8.7992 8.28592 8.98361C8.26615 9.21182 8.24916 10.8714 8.24708 11.3004C8.245 11.7294 8.25228 13.3882 8.26997 13.6164C8.2824 13.798 8.35973 13.9691 8.48784 14.0984C8.61595 14.2278 8.78629 14.3067 8.96777 14.3208C9.06337 14.3311 9.15949 14.3358 9.25563 14.3347C9.35225 14.3316 9.4486 14.3228 9.54418 14.3083C9.72804 14.2849 9.89867 14.2004 10.0287 14.0683C10.1587 13.9362 10.2405 13.7642 10.2611 13.58C10.2871 13.3504 10.3256 11.7048 10.328 11.2792Z" fill="url(#paint1_linear_70_4106)"/>
<defs>
<linearGradient id="paint0_linear_70_4106" x1="4.39114e-05" y1="8.87957" x2="14.2471" y2="8.87957" gradientUnits="userSpaceOnUse">
<stop stop-color="#CC3232"/>
<stop offset="0.6" stop-color="#EF5A5A"/>
<stop offset="1" stop-color="#F47E67"/>
</linearGradient>
<linearGradient id="paint1_linear_70_4106" x1="0.00763737" y1="8.77964" x2="19.7238" y2="17.4187" gradientUnits="userSpaceOnUse">
<stop stop-color="#FFC80B"/>
<stop offset="1" stop-color="#E89318"/>
</linearGradient>
</defs>
</svg>
assets/svg/finance/level_reject_ic.svg 0 → 100644
View file @ b5225d58
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14.6362 1.02173C14.4673 0.852688 14.2667 0.718586 14.0459 0.627092C13.8252 0.535598 13.5885 0.488505 13.3495 0.488505C13.1106 0.488505 12.8739 0.535598 12.6532 0.627092C12.4324 0.718586 12.2318 0.852688 12.0629 1.02173L7.77416 5.31049L3.48757 1.02173C3.1461 0.680211 2.68295 0.488322 2.20001 0.488281C1.71706 0.488241 1.25388 0.680051 0.912358 1.02152C0.570835 1.36298 0.378947 1.82613 0.378906 2.30908C0.378866 2.79202 0.570676 3.2552 0.912141 3.59673L5.2009 7.88375L0.912141 12.1712C0.570733 12.5127 0.378978 12.9759 0.37906 13.4588C0.379141 13.9417 0.571053 14.4048 0.912575 14.7462C1.2541 15.0876 1.71726 15.2794 2.20016 15.2793C2.68307 15.2792 3.14616 15.0873 3.48757 14.7458L7.77416 10.4574L12.0616 14.7458C12.403 15.0872 12.8661 15.279 13.3489 15.279C13.8317 15.279 14.2948 15.0872 14.6362 14.7458C14.9776 14.4044 15.1694 13.9413 15.1694 13.4585C15.1694 12.9757 14.9776 12.5126 14.6362 12.1712L10.3478 7.88375L14.6362 3.59673C14.8055 3.42778 14.9398 3.2271 15.0314 3.00617C15.1231 2.78524 15.1703 2.54841 15.1703 2.30923C15.1703 2.07005 15.1231 1.83322 15.0314 1.61229C14.9398 1.39136 14.8055 1.19068 14.6362 1.02173Z" fill="url(#paint0_linear_70_4105)"/>
<defs>
<linearGradient id="paint0_linear_70_4105" x1="14.6349" y1="14.7445" x2="0.913879" y2="1.02347" gradientUnits="userSpaceOnUse">
<stop stop-color="#EF3739"/>
<stop offset="0.54" stop-color="#EF3739"/>
<stop offset="1" stop-color="#FF8C8B"/>
</linearGradient>
</defs>
</svg>
assets/svg/finance/other_payment_ic.svg 0 → 100644
View file @ b5225d58
<svg width="37" height="37" viewBox="0 0 37 37" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="18.208" cy="18.208" r="18.208" fill="#E6F6FF"/>
<g clip-path="url(#clip0_1_13667)">
<path d="M28.2031 17.7501C28.2031 23.4109 23.614 27.9999 17.9532 27.9999C12.2921 27.9999 7.70312 23.4109 7.70312 17.7501C7.70312 12.089 12.2921 7.5 17.9532 7.5C23.614 7.5 28.2031 12.089 28.2031 17.7501Z" fill="#FFC107"/>
<path d="M20.0497 22.4104C19.9137 22.4104 19.7776 22.3713 19.6566 22.2893L14.5315 18.7949C14.2789 18.6218 14.1672 18.3049 14.2576 18.0113C14.3479 17.7178 14.6192 17.5184 14.9256 17.5184H17.0222C17.9215 17.5184 18.653 16.7869 18.653 15.8877C18.653 14.9886 17.9215 14.2571 17.0222 14.2571H14.9256C14.5398 14.2571 14.2267 13.944 14.2267 13.5582C14.2267 13.1725 14.5398 12.8594 14.9256 12.8594H17.0222C18.6921 12.8594 20.0507 14.2179 20.0507 15.8877C20.0507 17.5025 18.7796 18.8267 17.1853 18.9123L20.4449 21.1348C20.7636 21.3519 20.8455 21.7871 20.6284 22.1057C20.4933 22.3032 20.2734 22.4104 20.0497 22.4104Z" fill="#FAFAFA"/>
<path d="M20.9823 14.2571H14.9254C14.5397 14.2571 14.2266 13.944 14.2266 13.5582C14.2266 13.1725 14.5397 12.8594 14.9254 12.8594H20.9823C21.3681 12.8594 21.6812 13.1725 21.6812 13.5582C21.6812 13.944 21.3681 14.2571 20.9823 14.2571Z" fill="#FAFAFA"/>
<path d="M20.9823 16.8196H14.9254C14.5397 16.8196 14.2266 16.5065 14.2266 16.1207C14.2266 15.735 14.5397 15.4219 14.9254 15.4219H20.9823C21.3681 15.4219 21.6812 15.735 21.6812 16.1207C21.6812 16.5065 21.3681 16.8196 20.9823 16.8196Z" fill="#FAFAFA"/>
</g>
<defs>
<clipPath id="clip0_1_13667">
<rect width="20.5" height="20.5" fill="white" transform="translate(7.70312 7.5)"/>
</clipPath>
</defs>
</svg>
assets/svg/order/receipt_list_ic.svg 0 → 100644
View file @ b5225d58
<svg width="37" height="37" viewBox="0 0 37 37" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="18.2041" cy="18.3096" r="18.208" fill="#E6F6FF"/>
<path d="M23.3499 14.9037C23.3499 15.0603 23.2876 15.2105 23.1769 15.3212C23.0662 15.4319 22.916 15.4941 22.7595 15.4941H20.3905C20.3905 15.5901 20.3979 15.6934 20.3979 15.7893C20.3979 16.9637 19.9313 18.09 19.1009 18.9204C18.2705 19.7508 17.1442 20.2173 15.9699 20.2173H14.8407L20.206 25.0955C20.264 25.1473 20.3111 25.2102 20.3444 25.2805C20.3778 25.3507 20.3967 25.427 20.4002 25.5047C20.4036 25.5824 20.3915 25.66 20.3645 25.733C20.3375 25.8059 20.2961 25.8727 20.2429 25.9294C20.1876 25.9899 20.1203 26.0381 20.0453 26.0712C19.9704 26.1042 19.8894 26.1213 19.8075 26.1213C19.6602 26.1199 19.5185 26.0648 19.4089 25.9663L12.9145 20.0623C12.8268 19.982 12.7654 19.877 12.7383 19.7612C12.7113 19.6453 12.7199 19.524 12.7629 19.4131C12.806 19.3023 12.8816 19.207 12.9798 19.1397C13.0779 19.0725 13.1941 19.0366 13.3131 19.0365H15.9699C16.8311 19.0365 17.657 18.6944 18.266 18.0855C18.8749 17.4765 19.2171 16.6505 19.2171 15.7893C19.2171 15.6934 19.2097 15.5901 19.2023 15.4941H13.3131C13.1565 15.4941 13.0063 15.4319 12.8956 15.3212C12.7849 15.2105 12.7227 15.0603 12.7227 14.9037C12.7227 14.7471 12.7849 14.597 12.8956 14.4862C13.0063 14.3755 13.1565 14.3133 13.3131 14.3133H18.8628C18.5901 13.7807 18.1757 13.3335 17.6653 13.021C17.155 12.7086 16.5683 12.5428 15.9699 12.5421H13.3131C13.1565 12.5421 13.0063 12.4799 12.8956 12.3692C12.7849 12.2585 12.7227 12.1083 12.7227 11.9517C12.7227 11.7951 12.7849 11.645 12.8956 11.5343C13.0063 11.4235 13.1565 11.3613 13.3131 11.3613H22.7595C22.916 11.3613 23.0662 11.4235 23.1769 11.5343C23.2876 11.645 23.3499 11.7951 23.3499 11.9517C23.3499 12.1083 23.2876 12.2585 23.1769 12.3692C23.0662 12.4799 22.916 12.5421 22.7595 12.5421H18.9735C19.5022 13.0289 19.9048 13.6367 20.1469 14.3133H22.7595C22.916 14.3133 23.0662 14.3755 23.1769 14.4862C23.2876 14.597 23.3499 14.7471 23.3499 14.9037Z" fill="#2D2D2D"/>
</svg>
assets/svg/order/tpc_list_ic.svg 0 → 100644
View file @ b5225d58
<svg width="37" height="38" viewBox="0 0 37 38" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="18.7041" cy="19.0303" r="18.208" fill="#E6F6FF"/>
<path d="M18.9712 18.7617C18.3325 18.7617 17.7183 18.6264 17.1453 18.3592C15.1764 17.4426 14.164 15.1833 14.7898 13.1048C15.3439 11.2652 17.0822 9.98047 19.0168 9.98047C19.2272 9.98047 19.4394 9.99636 19.6473 10.0269C21.7825 10.3434 23.3928 12.2123 23.3928 14.3736C23.3928 15.2267 23.1479 16.0544 22.6845 16.7665C21.8843 17.9971 20.4617 18.7617 18.9712 18.7617ZM19.0168 10.8395C17.458 10.8395 16.0582 11.873 15.6124 13.3527C15.1085 15.0257 15.9238 16.8434 17.5079 17.5813C17.9662 17.7948 18.4584 17.903 18.9712 17.903C20.1739 17.903 21.3207 17.288 21.9642 16.2992C22.3366 15.7262 22.5337 15.0609 22.5337 14.3745C22.5337 12.6354 21.2387 11.132 19.5215 10.8773C19.3552 10.852 19.1851 10.8395 19.0168 10.8395Z" fill="#2D2D2D"/>
<path d="M26.4878 23.4401C26.2507 23.4401 26.0583 23.2481 26.0583 23.0105C26.0583 21.624 25.4638 20.3002 24.4274 19.3793C24.25 19.2221 24.2341 18.9507 24.3918 18.7733C24.5494 18.5959 24.8213 18.5796 24.9982 18.7376C26.2181 19.8213 26.9178 21.3788 26.9178 23.0105C26.9174 23.2481 26.7249 23.4401 26.4878 23.4401Z" fill="#2D2D2D"/>
<path d="M11.5096 23.4401C11.2725 23.4401 11.0801 23.2481 11.0801 23.0105C11.0801 21.3788 11.7798 19.8213 12.9996 18.7376C13.177 18.5796 13.448 18.5959 13.6061 18.7733C13.7637 18.9507 13.7479 19.2221 13.5705 19.3793C12.534 20.3007 11.9396 21.6245 11.9396 23.0105C11.9391 23.2481 11.7467 23.4401 11.5096 23.4401Z" fill="#2D2D2D"/>
<path d="M13.2851 19.4878C13.1623 19.4878 13.0403 19.4354 12.9553 19.3336C12.8032 19.1515 12.8277 18.8805 13.0098 18.7289C14.0106 17.8934 15.2167 17.3265 16.4984 17.0898C16.7325 17.0447 16.9554 17.201 16.9988 17.4343C17.0417 17.6675 16.8875 17.8913 16.6543 17.9347C15.5178 18.1447 14.4479 18.6472 13.56 19.3886C13.4797 19.4552 13.3822 19.4878 13.2851 19.4878Z" fill="#2D2D2D"/>
<path d="M24.7135 19.4881C24.6164 19.4881 24.5189 19.4555 24.4381 19.3885C23.5507 18.6471 22.4804 18.1446 21.3438 17.9345C21.1106 17.8912 20.9564 17.6674 20.9994 17.4342C21.0423 17.2009 21.2657 17.045 21.4998 17.0897C22.7815 17.3268 23.9876 17.8933 24.9884 18.7287C25.1705 18.8808 25.195 19.1514 25.0429 19.3335C24.9587 19.4357 24.8363 19.4881 24.7135 19.4881Z" fill="#2D2D2D"/>
<path d="M26.4881 25.3823C26.251 25.3823 26.0586 25.1903 26.0586 24.9528V23.0096C26.0586 22.7721 26.251 22.5801 26.4881 22.5801C26.7252 22.5801 26.9176 22.7721 26.9176 23.0096V24.9528C26.9176 25.1903 26.7252 25.3823 26.4881 25.3823Z" fill="#2D2D2D"/>
<path d="M25.2517 27.0665C25.0688 27.0665 24.8991 26.9488 24.842 26.7649C24.7711 26.5386 24.8974 26.2976 25.1242 26.2267C25.6838 26.0523 26.0597 25.5412 26.0597 24.9549C26.0597 24.7174 26.2521 24.5254 26.4892 24.5254C26.7263 24.5254 26.9187 24.7174 26.9187 24.9549C26.9187 25.9192 26.3006 26.7598 25.3802 27.0471C25.3372 27.0604 25.2938 27.0665 25.2517 27.0665Z" fill="#2D2D2D"/>
<path d="M19.0002 28.024C16.8535 28.024 14.7067 27.698 12.6201 27.0464C12.3937 26.976 12.2674 26.735 12.3379 26.5087C12.4083 26.2823 12.6497 26.1556 12.8756 26.2269C16.8822 27.4777 21.1173 27.4777 25.1244 26.2269C25.3494 26.1565 25.5913 26.2823 25.6621 26.5087C25.733 26.735 25.6067 26.976 25.3799 27.0464C23.2937 27.698 21.147 28.024 19.0002 28.024Z" fill="#2D2D2D"/>
<path d="M11.5096 25.3823C11.2725 25.3823 11.0801 25.1903 11.0801 24.9528V23.0096C11.0801 22.7721 11.2725 22.5801 11.5096 22.5801C11.7467 22.5801 11.9391 22.7721 11.9391 23.0096V24.9528C11.9391 25.1903 11.7467 25.3823 11.5096 25.3823Z" fill="#2D2D2D"/>
<path d="M12.7466 27.0665C12.7041 27.0665 12.6612 27.06 12.6186 27.0471C11.6982 26.7598 11.0801 25.9192 11.0801 24.9549C11.0801 24.7174 11.2725 24.5254 11.5096 24.5254C11.7467 24.5254 11.9391 24.7174 11.9391 24.9549C11.9391 25.5412 12.315 26.0523 12.8746 26.2267C13.101 26.2976 13.2273 26.5386 13.1568 26.7649C13.0993 26.9488 12.9296 27.0665 12.7466 27.0665Z" fill="#2D2D2D"/>
</svg>
lib/Notifiers/GeneratorDetailsProvider.dart
View file @ b5225d58
...@@ -61,6 +61,7 @@ class Generatordetailsprovider extends ChangeNotifier { ...@@ -61,6 +61,7 @@ class Generatordetailsprovider extends ChangeNotifier {
String? _genLocationLatLngs; String? _genLocationLatLngs;
String _title = "-"; String _title = "-";
String _subTitle = "-"; String _subTitle = "-";
String _note = "-";
bool _isLoading = false; bool _isLoading = false;
String? _scannedGenID; String? _scannedGenID;
final ImagePicker _picker = ImagePicker(); final ImagePicker _picker = ImagePicker();
...@@ -145,6 +146,7 @@ class Generatordetailsprovider extends ChangeNotifier { ...@@ -145,6 +146,7 @@ class Generatordetailsprovider extends ChangeNotifier {
String get title => _title; String get title => _title;
String get subTitle => _subTitle; String get subTitle => _subTitle;
String get note => _note;
String? get selectedType => _selectedType; String? get selectedType => _selectedType;
...@@ -317,6 +319,7 @@ class Generatordetailsprovider extends ChangeNotifier { ...@@ -317,6 +319,7 @@ class Generatordetailsprovider extends ChangeNotifier {
case "Generator Details": case "Generator Details":
_title = "Generator Details"; _title = "Generator Details";
_subTitle = "to open Generator Details"; _subTitle = "to open Generator Details";
_note = "Note*: 'Tag Generator' are moved to 'Generator Details'.";
notifyListeners(); notifyListeners();
break; break;
case "Register Complaint": case "Register Complaint":
......
lib/Notifiers/financeProvider/RequesitionLidtDetailsProvider.dart
View file @ b5225d58
...@@ -116,6 +116,7 @@ String? proposedAmountError; ...@@ -116,6 +116,7 @@ String? proposedAmountError;
_selectedPaymentAccounts = value; _selectedPaymentAccounts = value;
_selectedValue = value!.name!; _selectedValue = value!.name!;
_selectedID = value!.id; _selectedID = value!.id;
selectpaymentAccountError = null;
notifyListeners(); notifyListeners();
} }
...@@ -330,6 +331,15 @@ String? proposedAmountError; ...@@ -330,6 +331,15 @@ String? proposedAmountError;
String? remarksError; String? remarksError;
String? ApprovedAmountError; String? ApprovedAmountError;
String? selectpaymentAccountError;
bool _submitClicked = false;
bool get submitClicked => _submitClicked;
set submitClicked(bool value){
_submitClicked = value;
notifyListeners();
}
Future<void> paymentrequisitionRejectSubmitAPIFunction(context, Future<void> paymentrequisitionRejectSubmitAPIFunction(context,
mode, mode,
...@@ -368,6 +378,12 @@ String? proposedAmountError; ...@@ -368,6 +378,12 @@ String? proposedAmountError;
approve_remarks, approve_remarks,
proposed_payment_account_id,) async { proposed_payment_account_id,) async {
try { try {
if(!validateApproval(approved_amount,
approve_remarks,
proposed_payment_account_id,)){
return;
}
var provider = Provider.of<HomescreenNotifier>(context, listen: false); var provider = Provider.of<HomescreenNotifier>(context, listen: false);
final data = await ApiCalling.ApprovePaymentRequestSubmitAPI( final data = await ApiCalling.ApprovePaymentRequestSubmitAPI(
provider.empId, provider.empId,
...@@ -378,34 +394,52 @@ String? proposedAmountError; ...@@ -378,34 +394,52 @@ String? proposedAmountError;
approve_remarks, approve_remarks,
proposed_payment_account_id, proposed_payment_account_id,
); );
if (data != null) {
if (data.error == "0") {
paymentRequesitionDetails(context, payment_request_id);
resetAll();
toast(context, data.message);
Navigator.pop(context,true);
notifyListeners();
}
}
} catch (e, s) {}
}
bool validateApproval(approved_amount,
approve_remarks,
proposed_payment_account_id,){
remarksError = null;
ApprovedAmountError = null;
selectpaymentAccountError = null;
bool isValid = true;
if(approved_amount.toString().trim().isEmpty){ if(approved_amount.toString().trim().isEmpty){
ApprovedAmountError = "Enter Amount"; ApprovedAmountError = "Enter Amount";
notifyListeners(); isValid = false;
return;
} }
if(approve_remarks.toString().trim().isEmpty) { if(approve_remarks.toString().trim().isEmpty) {
remarksError = "Please Enter Remarks"; remarksError = "Please Enter Remarks";
notifyListeners(); isValid = false;
return;
} }
final numberFormat = NumberFormat.decimalPattern(); final numberFormat = NumberFormat.decimalPattern();
if(numberFormat.parse(approvedAmount.text) > numberFormat.parse(requestedAmount.text)){ if(numberFormat.parse(approvedAmount.text) > numberFormat.parse(requestedAmount.text)){
ApprovedAmountError = "Approved Amount should not be greater than requested amount"; ApprovedAmountError = "Approved Amount should not be greater than requested amount";
return; isValid = false;
}else{ }
ApprovedAmountError = null; if (_selectedPaymentAccounts == null || _selectedID.isEmpty) {
selectpaymentAccountError = "Please select an account";
isValid = false;
} }
if (data != null) { _submitClicked = false;
if (data.error == "0") {
paymentRequesitionDetails(context, payment_request_id);
resetAll();
toast(context, data.message);
Navigator.pop(context,true);
notifyListeners(); notifyListeners();
return isValid;
} }
}
} catch (e, s) {} checkApprovalDropDown(){
} }
Future<void> paymentrequisitionProcessSubmitAPIFunction(context, Future<void> paymentrequisitionProcessSubmitAPIFunction(context,
...@@ -441,6 +475,7 @@ String? proposedAmountError; ...@@ -441,6 +475,7 @@ String? proposedAmountError;
} }
resetAll() { resetAll() {
checkDropDownReset();
requestedAmount.clear(); requestedAmount.clear();
proposedPaymentAccount.clear(); proposedPaymentAccount.clear();
approvedAmountReadonly.clear(); approvedAmountReadonly.clear();
...@@ -464,7 +499,8 @@ String? proposedAmountError; ...@@ -464,7 +499,8 @@ String? proposedAmountError;
proposedAmountError = null; proposedAmountError = null;
remarksError = null; remarksError = null;
ApprovedAmountError = null; ApprovedAmountError = null;
checkDropDownReset(); selectpaymentAccountError = null;
notifyListeners(); notifyListeners();
} }
......
lib/Notifiers/financeProvider/RequestionListProvider.dart
View file @ b5225d58
...@@ -1132,13 +1132,14 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -1132,13 +1132,14 @@ class Requestionlistprovider extends ChangeNotifier {
isValid = false; isValid = false;
_submitClicked = false; _submitClicked = false;
} }
if (["Cheque", "RTGS", "IMPS", "NEFT"].contains(_paymentModeValue)) {
if (bankNameController.text.trim().isEmpty) { if (bankNameController.text.trim().isEmpty) {
bankNameError = "Please enter bank name"; bankNameError = "Please enter bank name";
isValid = false; isValid = false;
_submitClicked = false; _submitClicked = false;
} }
if (["Cheque", "RTGS", "IMPS", "NEFT"].contains(_paymentModeValue)) {
if (bankBranchController.text.trim().isEmpty) { if (bankBranchController.text.trim().isEmpty) {
bankBranchError = "Please enter bank branch"; bankBranchError = "Please enter bank branch";
isValid = false; isValid = false;
...@@ -1162,11 +1163,17 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -1162,11 +1163,17 @@ class Requestionlistprovider extends ChangeNotifier {
} }
if (_paymentModeValue == "UPI") { if (_paymentModeValue == "UPI") {
if (bankUpiController.text.trim().isEmpty) { if (bankUpiController.text.trim().isEmpty) {
UPIError = "Please enter UPI ID"; UPIError = "Please enter UPI ID";
isValid = false; isValid = false;
_submitClicked = false; _submitClicked = false;
} }
if(!RegExp(r"^[a-zA-Z0-9.-]{2,256}@[a-zA-Z][a-zA-Z]{2,64}$").hasMatch(bankUpiController.text)){
UPIError = "Please enter UPI ID correctly.";
isValid = false;
_submitClicked = false;
}
} }
// if (_image_picked == 0) { // if (_image_picked == 0) {
...@@ -1174,7 +1181,7 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -1174,7 +1181,7 @@ class Requestionlistprovider extends ChangeNotifier {
// isValid = false;_submitClicked = false; // isValid = false;_submitClicked = false;
// } // }
buttonEnabled = isValid; buttonEnabled = isValid;
_submitClicked = true; _submitClicked = false;
notifyListeners(); notifyListeners();
return isValid; return isValid;
} }
......
lib/Notifiers/financeProvider/paymentReceiptsProvider.dart
View file @ b5225d58
...@@ -62,6 +62,7 @@ class Paymentreceiptsprovider extends ChangeNotifier { ...@@ -62,6 +62,7 @@ class Paymentreceiptsprovider extends ChangeNotifier {
// Date picker state // Date picker state
DateTime? _date; DateTime? _date;
String? _formattedDate; String? _formattedDate;
String? _formattedDateToSend;
List<Accounts> _accounts = []; List<Accounts> _accounts = [];
List<PaymentModes> _paymentModes = []; List<PaymentModes> _paymentModes = [];
List<String> _requestingPurposes = []; List<String> _requestingPurposes = [];
...@@ -240,7 +241,7 @@ class Paymentreceiptsprovider extends ChangeNotifier { ...@@ -240,7 +241,7 @@ class Paymentreceiptsprovider extends ChangeNotifier {
List<String> get requestingPurposes => _requestingPurposes; List<String> get requestingPurposes => _requestingPurposes;
String? get formattedDate => _formattedDate; String? get formattedDate => _formattedDate;
String? get formattedDateToSend => _formattedDateToSend;
bool get submitClicked => _submitClicked; bool get submitClicked => _submitClicked;
set submitClicked(bool value) { set submitClicked(bool value) {
...@@ -272,7 +273,8 @@ class Paymentreceiptsprovider extends ChangeNotifier { ...@@ -272,7 +273,8 @@ class Paymentreceiptsprovider extends ChangeNotifier {
void setDate(DateTime newDate) { void setDate(DateTime newDate) {
_date = newDate; _date = newDate;
_formattedDate = DateFormat('yyyy-MM-dd').format(newDate); _formattedDate = DateFormat('d MMM yyyy').format(newDate);
_formattedDateToSend = DateFormat('yyyy-MM-dd').format(newDate);
dateController.text = _formattedDate!; dateController.text = _formattedDate!;
dateError = null; dateError = null;
notifyListeners(); notifyListeners();
...@@ -767,6 +769,10 @@ class Paymentreceiptsprovider extends ChangeNotifier { ...@@ -767,6 +769,10 @@ class Paymentreceiptsprovider extends ChangeNotifier {
FileError = null; FileError = null;
buttonEnabled = false; buttonEnabled = false;
dateError = null; dateError = null;
_formattedDateToSend = null;
_formattedDate = null;
_date = null;
_showMoreDetails = false;
checkDropDownSelected(); checkDropDownSelected();
notifyListeners(); notifyListeners();
} }
......
lib/Notifiers/splashVersionNotifier.dart
View file @ b5225d58
...@@ -45,25 +45,26 @@ class SplashVersionNotifier extends ChangeNotifier { ...@@ -45,25 +45,26 @@ class SplashVersionNotifier extends ChangeNotifier {
var loginProvider = Provider.of<Loginnotifier>(context, listen: false); var loginProvider = Provider.of<Loginnotifier>(context, listen: false);
var loginStatus = await SharedpreferencesService().getInt("loginStatus"); var loginStatus = await SharedpreferencesService().getInt("loginStatus");
print("login status: ${loginStatus}"); // print("login status: ${loginStatus}");
print("login status provider: ${loginProvider.loginStatus}"); // print("login status provider: ${loginProvider.loginStatus}");
final int currentBuild =
int.parse(_packagedetails["Build Number"] ?? "0") ?? 0;
try { try {
final data = await ApiCalling.checkAppVersionApi(); final data = await ApiCalling.checkAppVersionApi();
if (data != null) { if (data != null) {
final int currentBuild =
int.parse(_packagedetails["Build Number"] ?? "0") ?? 0;
if (kDebugMode) { if (kDebugMode) {
print("Current Build: $currentBuild"); print("Current Build: $currentBuild");
print("Server Response: $data"); print("Server Response: $data");
} }
if (Platform.isAndroid && if (Platform.isAndroid &&
currentBuild < (data.latestVersionCode ?? 0)) { currentBuild < (data.latestVersionCode ?? 0)) {
print("Update"); // print("Update");
AppUpdateDialouge(context, data.url!, data.releaseNotes!); AppUpdateDialouge(context, data.url!, data.releaseNotes!);
} else if (Platform.isIOS && } else if (Platform.isIOS &&
currentBuild < (data.iosLatestVersionCode ?? 0)) { currentBuild < (data.iosLatestVersionCode ?? 0)) {
print("Update"); // print("Update");
AppUpdateDialouge(context, data.iosUrl!, data.iosReleaseNotes!); AppUpdateDialouge(context, data.iosUrl!, data.iosReleaseNotes!);
} else { } else {
// Version is up to date // Version is up to date
...@@ -94,7 +95,7 @@ class SplashVersionNotifier extends ChangeNotifier { ...@@ -94,7 +95,7 @@ class SplashVersionNotifier extends ChangeNotifier {
final data = await ApiCalling.CheckSessionExistsApi(empId, session); final data = await ApiCalling.CheckSessionExistsApi(empId, session);
if (data != null) { if (data != null) {
if (data.sessionExists == 1) { if (data.sessionExists == 1) {
print("geos session"); // print("geos session");
if (data.updatePasswordRequired == 0) { if (data.updatePasswordRequired == 0) {
Navigator.push( Navigator.push(
context, context,
...@@ -109,7 +110,7 @@ class SplashVersionNotifier extends ChangeNotifier { ...@@ -109,7 +110,7 @@ class SplashVersionNotifier extends ChangeNotifier {
); );
} }
} else { } else {
print("goes here"); // print("goes here");
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => LoginScreen(), MaterialPageRoute(builder: (context) => LoginScreen(),
......
lib/main.dart
View file @ b5225d58
...@@ -3,6 +3,7 @@ import 'dart:io'; ...@@ -3,6 +3,7 @@ import 'dart:io';
import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart';
...@@ -135,7 +136,7 @@ void main() async { ...@@ -135,7 +136,7 @@ void main() async {
await FirebaseMessaging.instance.getToken().then((value) { await FirebaseMessaging.instance.getToken().then((value) {
String? token = value; String? token = value;
if (kDebugMode) { if (kDebugMode) {
print("fbstoken:{$token}"); // print("fbstoken:{$token}");
} }
SharedpreferencesService().saveString("fbstoken", token!); SharedpreferencesService().saveString("fbstoken", token!);
...@@ -229,6 +230,10 @@ class MyApp extends StatelessWidget { ...@@ -229,6 +230,10 @@ class MyApp extends StatelessWidget {
child: Builder( child: Builder(
builder: (BuildContext context) { builder: (BuildContext context) {
return MaterialApp( return MaterialApp(
scrollBehavior: const MaterialScrollBehavior().copyWith(
dragDevices: {PointerDeviceKind.touch,PointerDeviceKind.mouse},
),
navigatorObservers: [MyNavigatorObserver()], navigatorObservers: [MyNavigatorObserver()],
builder: (BuildContext context, Widget? child) { builder: (BuildContext context, Widget? child) {
final MediaQueryData data = MediaQuery.of(context); final MediaQueryData data = MediaQuery.of(context);
......
lib/screens/commom/addCommonPayment.dart
View file @ b5225d58
...@@ -141,32 +141,7 @@ class _AddcommonpaymentState extends State<Addcommonpayment> { ...@@ -141,32 +141,7 @@ class _AddcommonpaymentState extends State<Addcommonpayment> {
onStepCancel: _previousStep, onStepCancel: _previousStep,
onStepTapped: (value) { onStepTapped: (value) {
print(value); print(value);
// setState(() {
//
// if(value==0){
// _currentStep = value;
// }
// if(_currentStep==1 && value==0){
// _currentStep = value;
// }
// if(_currentStep==2 && value == 1){
// _currentStep = value;
// }
// if (value == 1) {
// if(provider.validateStep1()){
// _currentStep = value;
// }
//
// } else if (value == 2) {
// if(provider.validateStep2()){
// _currentStep = value;
// }
//
// }
// else {
// _currentStep = value;
// }
// });
setState(() { setState(() {
if (value == 1 && !provider.validateStep1()) { if (value == 1 && !provider.validateStep1()) {
return; return;
...@@ -441,7 +416,7 @@ class _AddcommonpaymentState extends State<Addcommonpayment> { ...@@ -441,7 +416,7 @@ class _AddcommonpaymentState extends State<Addcommonpayment> {
if (provider if (provider
.selectedDistricts != .selectedDistricts !=
null) { null) {
provider.states.clear(); provider.districts.clear();
// provider.selectedDistricts = null; // provider.selectedDistricts = null;
provider.selectedDistrictId = provider.selectedDistrictId =
null; null;
...@@ -587,6 +562,7 @@ class _AddcommonpaymentState extends State<Addcommonpayment> { ...@@ -587,6 +562,7 @@ class _AddcommonpaymentState extends State<Addcommonpayment> {
if (provider if (provider
.selectedSubLocations != .selectedSubLocations !=
null) { null) {
provider.subLocations.clear();
// provider.selectedSubLocations = // provider.selectedSubLocations =
// null; // null;
provider.selectedSubLocID = provider.selectedSubLocID =
......
lib/screens/finance/PaymentRequestionListDetails.dart
View file @ b5225d58
...@@ -718,7 +718,7 @@ class _PaymentrequestionlistdetailsState ...@@ -718,7 +718,7 @@ class _PaymentrequestionlistdetailsState
"Employee", "Employee",
"Amount", "Amount",
"Payment Date", "Payment Date",
"Attachment" "Attachment",
]; ];
final subHeadings3 = [ final subHeadings3 = [
pay_det.accountName ?? "-", pay_det.accountName ?? "-",
...@@ -728,7 +728,6 @@ class _PaymentrequestionlistdetailsState ...@@ -728,7 +728,6 @@ class _PaymentrequestionlistdetailsState
req_det.amount ?? "-", req_det.amount ?? "-",
req_det.date ?? "-", req_det.date ?? "-",
"View", "View",
]; ];
final headings4 = [ final headings4 = [
"Bank Name", "Bank Name",
...@@ -758,34 +757,12 @@ class _PaymentrequestionlistdetailsState ...@@ -758,34 +757,12 @@ class _PaymentrequestionlistdetailsState
req_det.level2Employee ?? "-", req_det.level2Employee ?? "-",
req_det.level2ApprovalRemarks ?? "-", req_det.level2ApprovalRemarks ?? "-",
]; ];
final headings6 = ["Note", "Created Employee", ]; final headings6 = ["Note", "Created Employee"];
final subHeadings6 = [ final subHeadings6 = [
req_det.description ?? "-", req_det.description ?? "-",
req_det.createdEmployee ?? "-", req_det.createdEmployee ?? "-",
]; ];
var headings = [...headings2];
var subHeadings = [...subHeadings2];
var titles = ["Account Details"];
if (provider.showMoreDetails) {
headings = [...headings3, ...headings4, ...headings5, ...headings6];
subHeadings = [
...subHeadings2,
...subHeadings3,
...subHeadings4,
...subHeadings5,
...subHeadings6,
];
titles = [
"Account Details",
"Request Details",
"Bank Details",
"Approval Details",
"Other Details",
];
}
final sections = [ final sections = [
{ {
"title": "Account Details", "title": "Account Details",
...@@ -989,6 +966,10 @@ class _PaymentrequestionlistdetailsState ...@@ -989,6 +966,10 @@ class _PaymentrequestionlistdetailsState
Column( Column(
children: List.generate(headings.length, (j) { children: List.generate(headings.length, (j) {
if (provider.Headings[j] == "Attachment" &&
req_det.attachmentViewFileName == "") {
return SizedBox.shrink();
}
return Container( return Container(
padding: EdgeInsets.symmetric(vertical: 7), padding: EdgeInsets.symmetric(vertical: 7),
child: Row( child: Row(
...@@ -1124,20 +1105,33 @@ class _PaymentrequestionlistdetailsState ...@@ -1124,20 +1105,33 @@ class _PaymentrequestionlistdetailsState
); );
}, },
child: Container( child: Container(
decoration: BoxDecoration( alignment: Alignment.center,
borderRadius: BorderRadius.circular(8), // decoration: BoxDecoration(
color: Color(0xFFFFEFEF), // borderRadius: BorderRadius.circular(8),
border: Border.all( // color: Color(0xFFFFEFEF),
color: Color(0xFFED3424), // border: Border.all(
width: 0.5, // color: Color(0xFFED3424),
), // width: 0.5,
// ),
// ),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset(
"assets/svg/finance/level_reject_ic.svg",
), ),
child: Center( SizedBox(width: 5,),
Center(
child: Text( child: Text(
"Reject", "Reject",
style: TextStyle(color: Color(0xFFED3424)), style: TextStyle(
color: AppColors.semi_black,
fontSize: 14,
),
), ),
), ),
],
),
), ),
), ),
), ),
...@@ -1166,22 +1160,33 @@ class _PaymentrequestionlistdetailsState ...@@ -1166,22 +1160,33 @@ class _PaymentrequestionlistdetailsState
); );
}, },
child: Container( child: Container(
decoration: BoxDecoration( alignment: Alignment.center,
borderRadius: BorderRadius.circular(8), // decoration: BoxDecoration(
color: Color(0xFFE7FFE5), // borderRadius: BorderRadius.circular(8),
border: Border.all( // color: Color(0xFFE7FFE5),
color: Color(0xFF0D9C00), // border: Border.all(
width: 0.5, // color: Color(0xFF0D9C00),
), // width: 0.5,
// ),
// ),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset(
"assets/svg/finance/level_approve_ic.svg",
), ),
child: Center( SizedBox(width: 5,),
Center(
child: Text( child: Text(
"Approve", "Approve",
style: TextStyle( style: TextStyle(
color: Color(0xFF0D9C00), color: AppColors.semi_black,
fontSize: 14,
), ),
), ),
), ),
],
),
), ),
), ),
), ),
...@@ -1206,22 +1211,31 @@ class _PaymentrequestionlistdetailsState ...@@ -1206,22 +1211,31 @@ class _PaymentrequestionlistdetailsState
); );
}, },
child: Container( child: Container(
decoration: BoxDecoration( alignment: Alignment.center,
borderRadius: BorderRadius.circular(8), // decoration: BoxDecoration(
color: Color(0xFFE7FFE5), // borderRadius: BorderRadius.circular(8),
border: Border.all( // color: Color(0xFFE7FFE5),
color: Color(0xFF0D9C00), // border: Border.all(
width: 0.5, // color: Color(0xFF0D9C00),
), // width: 0.5,
), // ),
child: Center( // ),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset("assets/svg/finance/level_add_payment_ic.svg"),
SizedBox(width: 5,),
Center(
child: Text( child: Text(
"Add Payment", "Add Payment",
style: TextStyle( style: TextStyle(
color: Color(0xFF0D9C00), color: AppColors.semi_black,
fontSize: 14
), ),
), ),
), ),
],
),
), ),
), ),
), ),
...@@ -1319,7 +1333,10 @@ class _PaymentrequestionlistdetailsState ...@@ -1319,7 +1333,10 @@ class _PaymentrequestionlistdetailsState
remarks, remarks,
"Remarks", "Remarks",
"Enter Remarks", "Enter Remarks",
(p0) {}, (p0) {
provider.remarksError = null;
provider.notifyListeners();
},
TextInputType.text, TextInputType.text,
false, false,
null, null,
...@@ -1358,7 +1375,14 @@ class _PaymentrequestionlistdetailsState ...@@ -1358,7 +1375,14 @@ class _PaymentrequestionlistdetailsState
), ),
) )
.toList(), .toList(),
value: provider.selectedPaymentAccounts,
value:
provider.paymentsAccounts.contains(
provider.selectedPaymentAccounts,
)
? provider.selectedPaymentAccounts
: null,
// value: provider.selectedPaymentAccounts,
onChanged: (PaymentAccounts? value) { onChanged: (PaymentAccounts? value) {
if (value != null) { if (value != null) {
if (provider if (provider
...@@ -1432,6 +1456,10 @@ class _PaymentrequestionlistdetailsState ...@@ -1432,6 +1456,10 @@ class _PaymentrequestionlistdetailsState
], ],
), ),
), ),
errorWidget(
context,
provider.selectpaymentAccountError,
),
InkWell( InkWell(
onTap: () { onTap: () {
provider provider
......
lib/screens/finance/financeDashboard.dart
View file @ b5225d58
...@@ -741,6 +741,15 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -741,6 +741,15 @@ class _FinancedashboardState extends State<Financedashboard> {
// "Add Direct Payment", // "Add Direct Payment",
// "Add Account" // "Add Account"
// ]; // ];
final icons = [
"assets/svg/finance/fin_self_ic.svg",
"assets/svg/finance/fin_admin_ic.svg",
"assets/svg/finance/fin_process_ic.svg",
"assets/svg/finance/other_payment_ic.svg",
"assets/svg/finance/fin_receipts_ic.svg",
"assets/svg/finance/fin_payments_ic.svg",
"assets/svg/finance/fin_accounts_ic.svg",
];
return ListTile( return ListTile(
onTap: () async { onTap: () async {
var res; var res;
...@@ -848,7 +857,7 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -848,7 +857,7 @@ class _FinancedashboardState extends State<Financedashboard> {
Navigator.pop(context); Navigator.pop(context);
}, },
leading: SvgPicture.asset( leading: SvgPicture.asset(
"assets/svg/fin_ic.svg", icons[index],
), ),
title: Text( title: Text(
"${pages2[index].pageName}", "${pages2[index].pageName}",
......
lib/screens/finance/submitPaymentRequestionListsByMode.dart
View file @ b5225d58
...@@ -481,6 +481,7 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -481,6 +481,7 @@ class _SubmitpaymentrequestionlistsbymodeState
"RTGS", "RTGS",
"IMPS", "IMPS",
"NEFT", "NEFT",
"UPI"
].contains(provider.paymentModeValue)) { ].contains(provider.paymentModeValue)) {
WidgetsBinding.instance WidgetsBinding.instance
.addPostFrameCallback((_) { .addPostFrameCallback((_) {
...@@ -638,7 +639,7 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -638,7 +639,7 @@ class _SubmitpaymentrequestionlistsbymodeState
), ),
], ],
errorWidget(context, provider.FileError), errorWidget(context, provider.FileError),
SizedBox(height: 3, key: _globalKey),
if ([ if ([
"Cheque", "Cheque",
"RTGS", "RTGS",
...@@ -646,7 +647,7 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -646,7 +647,7 @@ class _SubmitpaymentrequestionlistsbymodeState
"NEFT", "NEFT",
].contains(provider.paymentModeValue)) ...[ ].contains(provider.paymentModeValue)) ...[
SizedBox(height: 3, key: _globalKey),
textControllerWidget( textControllerWidget(
context, context,
provider.bankNameController, provider.bankNameController,
...@@ -744,6 +745,8 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -744,6 +745,8 @@ class _SubmitpaymentrequestionlistsbymodeState
TextInputAction.done, TextInputAction.done,
), ),
errorWidget(context, provider.UPIError), errorWidget(context, provider.UPIError),
SizedBox(height: 20,)
], ],
], ],
), ),
......
lib/screens/genTracker/ScanEnterGeneratorIDScreen.dart
View file @ b5225d58
...@@ -146,6 +146,7 @@ class _ScanentergeneratoridscreenState ...@@ -146,6 +146,7 @@ class _ScanentergeneratoridscreenState
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle(fontSize: 14, color: Colors.white), style: TextStyle(fontSize: 14, color: Colors.white),
), ),
Spacer(), Spacer(),
Text( Text(
"or", "or",
...@@ -172,6 +173,9 @@ class _ScanentergeneratoridscreenState ...@@ -172,6 +173,9 @@ class _ScanentergeneratoridscreenState
), ),
), ),
), ),
SizedBox(height: 10,),
Text(provider.note,
style: TextStyle(fontSize: 14, color: AppColors.grey_semi),),
SizedBox(height: 50), SizedBox(height: 50),
], ],
), ),
......
lib/screens/order/orderModuleDashboard.dart
View file @ b5225d58
...@@ -81,37 +81,90 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> { ...@@ -81,37 +81,90 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
return Consumer<Pagesdashboardprovider>( return Consumer<Pagesdashboardprovider>(
builder: (context, provider, child) { builder: (context, provider, child) {
final pages = provider.ordersAccessiblePagesList; final pages = provider.ordersAccessiblePagesList;
final orderListPages =
pages
.where((page) => page.pageName!.contains("Order List"))
.toList();
final receiptListPages =
pages
.where((page) => page.pageName!.contains("Receipt List"))
.toList();
final otherPages =
pages
.where(
(page) =>
!page.pageName!.contains("Order List") &&
!page.pageName!.contains("Receipt List"),
)
.toList();
print("receiptListPages ${receiptListPages.map((e) => e.pageName)}");
print("otherPages ${otherPages}");
final approvalOrderPages =
orderListPages
.where(
(page) => [
'level_one_approval',
'level_two_approval',
'level_two_rejected',
].contains(page.mode),
)
.toList();
final otherOrderPages =
orderListPages
.where(
(page) =>
![
'level_one_approval',
'level_two_approval',
'level_two_rejected',
].contains(page.mode),
)
.toList();
return Scaffold( return Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color, backgroundColor: AppColors.scaffold_bg_color,
appBar: appbarNew(context, "Orders",0xFFFFFFFF), appBar: appbarNew(context, "Orders", 0xFFFFFFFF),
body: Container( body: Container(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.vertical(bottom: Radius.circular(16)) borderRadius: BorderRadius.vertical(
bottom: Radius.circular(16),
),
), ),
child: Column( child: Column(
children: [ children: [
Container( Container(
height: 180, height: 180,
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage(image: AssetImage( image: DecorationImage(
image: AssetImage(
"assets/svg/order/main_dashboard.png", "assets/svg/order/main_dashboard.png",
), fit: BoxFit.contain,), ),
gradient: LinearGradient(colors: [ fit: BoxFit.contain,
),
gradient: LinearGradient(
colors: [
AppColors.scaffold_bg_color,
AppColors.scaffold_bg_color, AppColors.scaffold_bg_color,
AppColors.scaffold_bg_color ],
],begin: Alignment.topCenter,end: Alignment.bottomCenter) begin: Alignment.topCenter,
end: Alignment.bottomCenter,
),
), ),
), ),
if (provider.ordersgain.length > 0) ...[ if (provider.ordersgain.length > 0) ...[
Container( Container(
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), padding: EdgeInsets.symmetric(
horizontal: 10,
vertical: 5,
),
margin: EdgeInsets.only(bottom: 10), margin: EdgeInsets.only(bottom: 10),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
...@@ -121,12 +174,16 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> { ...@@ -121,12 +174,16 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
), ),
height: MediaQuery.of(context).size.height * 0.25, height: MediaQuery.of(context).size.height * 0.25,
child: GridView.builder( child: GridView.builder(
padding: EdgeInsets.symmetric(horizontal: 0, vertical: 5), padding: EdgeInsets.symmetric(
horizontal: 0,
vertical: 5,
),
itemCount: provider.ordersgain.length, itemCount: provider.ordersgain.length,
shrinkWrap: true, shrinkWrap: true,
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
physics: AlwaysScrollableScrollPhysics(), physics: AlwaysScrollableScrollPhysics(),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( gridDelegate:
SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2, crossAxisCount: 2,
crossAxisSpacing: 10, crossAxisSpacing: 10,
mainAxisSpacing: 10, mainAxisSpacing: 10,
...@@ -145,8 +202,6 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> { ...@@ -145,8 +202,6 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
"assets/svg/crm/today_visits_ic.svg", "assets/svg/crm/today_visits_ic.svg",
"assets/svg/crm/pending_tasks_ic.svg", "assets/svg/crm/pending_tasks_ic.svg",
"assets/svg/crm/quotes_generated_ic.svg", "assets/svg/crm/quotes_generated_ic.svg",
]; ];
final colors = [ final colors = [
...@@ -163,19 +218,23 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> { ...@@ -163,19 +218,23 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
]; ];
return InkResponse( return InkResponse(
child: Container( child: Container(
padding: EdgeInsets.symmetric(horizontal: 13), padding: EdgeInsets.symmetric(
horizontal: 13,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(colors[jndex]), color: Color(colors[jndex]),
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
), ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
mainAxisAlignment: MainAxisAlignment.center, CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.center,
children: [ children: [
Text( Text(
provider.ordersgain[jndex].count.toString(), provider.ordersgain[jndex].count
.toString(),
style: TextStyle( style: TextStyle(
fontSize: 20, fontSize: 20,
fontFamily: "JakartaMedium", fontFamily: "JakartaMedium",
...@@ -214,23 +273,163 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> { ...@@ -214,23 +273,163 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
], ],
), ),
), ),
ListView.builder(
itemCount: provider.ordersAccessiblePagesList.length, if (approvalOrderPages.isNotEmpty) ...[
Padding(
padding: const EdgeInsets.only(
top: 10,
bottom: 5,
left: 10,
),
child: Text(
"Approval Levels",
style: TextStyle(
color: AppColors.grey_thick,
fontSize: 14,
fontFamily: "JakartaMedium",
),
),
),
Container(
padding: EdgeInsets.symmetric(
vertical: 10,
horizontal: 15,
),
margin: EdgeInsets.symmetric(horizontal: 10),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(14),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: List.generate(approvalOrderPages.length, (
co,
) {
Widget? SvgIcon;
switch (approvalOrderPages[co].mode) {
case "level_one_approval":
SvgIcon = SvgPicture.asset(
"assets/svg/finance/fin_lvl1_ic.svg",
);
break;
case "level_two_approval":
case "level_two_rejected":
SvgIcon = SvgPicture.asset(
"assets/svg/finance/fin_lvl2_ic.svg",
);
break;
default:
SvgIcon = SvgPicture.asset(
"assets/svg/finance/fin_lvl1_ic.svg",
);
break;
}
;
return Expanded(
child: InkResponse(
onTap: () async {
var navigate;
if (approvalOrderPages[co].pageName!.contains(
"Order List",
)) {
navigate = OrderslistbyModes(
mode: approvalOrderPages[co].mode!,
pageTitleName:
approvalOrderPages[co].pageName!,
);
}
if (navigate != null) {
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => navigate,
),
);
}
},
child: SizedBox(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgIcon,
SizedBox(height: 10),
Text(
approvalOrderPages[co].pageName ?? "-",
maxLines: 2,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 12,
fontFamily: "JakartaMedium",
),
),
],
),
),
),
);
}),
),
),
],
if (otherOrderPages.isNotEmpty) ...[
Padding(
padding: const EdgeInsets.only(
top: 10,
bottom: 5,
left: 10,
),
child: Text(
"Order List",
style: TextStyle(
color: AppColors.grey_thick,
fontSize: 14,
fontFamily: "JakartaMedium",
),
),
),
GridView.builder(
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
childAspectRatio: 2 / 1,
),
itemCount: otherOrderPages.length,
shrinkWrap: true, shrinkWrap: true,
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, index) { itemBuilder: (context, index) {
Widget? SvgIcon; Widget? SvgIcon;
switch (pages[index].mode) { switch (otherOrderPages[index].mode) {
case "level_one_approval": case "level_one_approval":
SvgIcon = SvgPicture.asset("assets/svg/fin_lv1.svg"); SvgIcon = SvgPicture.asset(
"assets/svg/finance/fin_lvl1_ic.svg",
);
break; break;
case "level_two_approval": case "level_two_approval":
case "level_two_rejected": case "level_two_rejected":
SvgIcon = SvgPicture.asset("assets/svg/fin_lv2.svg"); SvgIcon = SvgPicture.asset(
"assets/svg/finance/fin_lvl2_ic.svg",
);
break;
case "self":
SvgIcon = SvgPicture.asset(
"assets/svg/finance/fin_self_ic.svg",
);
break;
case "pending_approval":
SvgIcon = SvgPicture.asset(
"assets/svg/finance/fin_accounts_ic.svg",
);
break;
case "sales_order_registered":
SvgIcon = SvgPicture.asset(
"assets/svg/finance/fin_process_ic.svg",
);
break; break;
default: default:
SvgIcon = SvgPicture.asset("assets/svg/fin_ic.svg"); SvgIcon = SvgPicture.asset(
"assets/svg/finance/other_payment_ic.svg",
);
break; break;
} }
; ;
...@@ -238,87 +437,334 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> { ...@@ -238,87 +437,334 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
return InkResponse( return InkResponse(
onTap: () async { onTap: () async {
var navigate; var navigate;
if (pages[index].pageName!.contains("Add Order")) { if (otherOrderPages[index].pageName!.contains(
navigate = AddorderScreen( "Order List",
mode: pages[index].mode!, )) {
pageTitleName: pages[index].pageName!, navigate = OrderslistbyModes(
mode: otherOrderPages[index].mode!,
pageTitleName: otherOrderPages[index].pageName!,
); );
} }
if (pages[index].pageName!.contains("Add Payment")) { if (navigate != null) {
("navigate to Add Payment"); await Navigator.push(
navigate = AddpaymentScreen( context,
mode: pages[index].mode!, MaterialPageRoute(
pageTitleName: pages[index].pageName!, builder: (context) => navigate,
),
); );
} else if (pages[index].pageName!.contains( }
},
child: Container(
padding: EdgeInsets.symmetric(
vertical: 5,
horizontal: 15,
),
margin: EdgeInsets.symmetric(
vertical: 7,
horizontal: 5,
),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(14),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
flex: 2,
child: SizedBox(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Text(
otherOrderPages[index].pageName ??
"-",
style: TextStyle(
fontSize: 14,
color: AppColors.app_blue,
fontFamily: "JakartaMedium",
),
),
// Text(
// filteredPaymentAdministrations[ad]['subtitle'] ??
// "-",
// maxLines: 2,
// style: TextStyle(
// fontSize: 12,
// color: AppColors.grey_semi,
// fontFamily: "JakartaMedium",
// ),
// ),
],
),
),
),
SizedBox(width: 10),
Expanded(flex: 1, child: SvgIcon),
],
),
),
);
},
),
],
if (receiptListPages.isNotEmpty) ...[
Padding(
padding: const EdgeInsets.only(
top: 10,
bottom: 5,
left: 10,
),
child: Text(
"Receipt List",
style: TextStyle(
color: AppColors.grey_thick,
fontSize: 14,
fontFamily: "JakartaMedium",
),
),
),
GridView.builder(
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
childAspectRatio: 2 / 1,
),
itemCount: receiptListPages.length,
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, index) {
Widget? SvgIcon;
switch (receiptListPages[index].mode) {
case "self":
SvgIcon = SvgPicture.asset(
"assets/svg/finance/fin_self_ic.svg",
);
break;
case "pending_approval":
SvgIcon = SvgPicture.asset(
"assets/svg/finance/fin_accounts_ic.svg",
);
break;
default:
SvgIcon = SvgPicture.asset(
"assets/svg/finance/other_payment_ic.svg",
);
break;
}
;
return InkResponse(
onTap: () async {
var navigate;
if (receiptListPages[index].pageName!.contains(
"Receipt List", "Receipt List",
)) { )) {
navigate = Paymentlistsbymode( navigate = Paymentlistsbymode(
mode: pages[index].mode!, mode: receiptListPages[index].mode!,
pageTitleName: pages[index].pageName!, pageTitleName:
receiptListPages[index].pageName!,
); );
} else if (pages[index].pageName!.contains( }
"Order List", if (navigate != null) {
)) { await Navigator.push(
navigate = OrderslistbyModes( context,
mode: pages[index].mode!, MaterialPageRoute(
pageTitleName: pages[index].pageName!, builder: (context) => navigate,
),
); );
} else if (pages[index].pageName == "Add TPC Agent") { }
navigate = AddtpcagentScreen(); },
} else if (pages[index].pageName == child: Container(
"TPC Agent List (Admin)") { padding: EdgeInsets.symmetric(
vertical: 5,
horizontal: 15,
),
margin: EdgeInsets.symmetric(
vertical: 7,
horizontal: 5,
),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(14),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
flex: 2,
child: SizedBox(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Text(
receiptListPages[index].pageName ??
"-",
style: TextStyle(
fontSize: 14,
color: AppColors.app_blue,
fontFamily: "JakartaMedium",
),
),
// Text(
// filteredPaymentAdministrations[ad]['subtitle'] ??
// "-",
// maxLines: 2,
// style: TextStyle(
// fontSize: 12,
// color: AppColors.grey_semi,
// fontFamily: "JakartaMedium",
// ),
// ),
],
),
),
),
SizedBox(width: 10),
Expanded(flex: 1, child: SvgIcon),
],
),
),
);
},
),
],
if (otherPages.isNotEmpty) ...[
Padding(
padding: const EdgeInsets.only(
top: 10,
bottom: 5,
left: 10,
),
child: Text(
"TPC",
style: TextStyle(
color: AppColors.grey_thick,
fontSize: 14,
fontFamily: "JakartaMedium",
),
),
),
GridView.builder(
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
childAspectRatio: 2 / 1,
),
itemCount: otherPages.length,
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, index) {
Widget? SvgIcon;
switch (otherPages[index].mode) {
case "self":
SvgIcon = SvgPicture.asset(
"assets/svg/finance/fin_receipts_ic.svg",
);
break;
default:
SvgIcon = SvgPicture.asset(
"assets/svg/finance/fin_payments_ic.svg",
);
break;
}
;
return InkResponse(
onTap: () async {
var navigate;
if (otherPages[index].pageName!.contains(
"TPC Agent List",
)) {
navigate = Tpcagentlistbymode( navigate = Tpcagentlistbymode(
mode: pages[index].mode!, mode: otherPages[index].mode!,
pageTitleName: pages[index].pageName!, pageTitleName: otherPages[index].pageName!,
); );
} else if (pages[index].pageName == } else if (otherPages[index].pageName ==
"Pending TPC Issue List") { "Pending TPC Issue List") {
navigate = Tpcagentissuelist( navigate = Tpcagentissuelist(
mode: pages[index].mode!, mode: otherPages[index].mode!,
pageTitleName: pages[index].pageName!, pageTitleName: otherPages[index].pageName!,
); );
} }
if (navigate != null) { if (navigate != null) {
await Navigator.push( await Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => navigate), MaterialPageRoute(
builder: (context) => navigate,
),
); );
} }
}, },
child: Container( child: Container(
margin: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 5,
vertical: 5, vertical: 5,
horizontal: 15,
), ),
padding: EdgeInsets.symmetric( margin: EdgeInsets.symmetric(
horizontal: 10, vertical: 7,
vertical: 15, horizontal: 5,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(14), borderRadius: BorderRadius.circular(14),
), ),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Expanded(flex: 1, child: SvgIcon),
Expanded( Expanded(
flex: 5, flex: 2,
child: Text("${pages[index].pageName}"), child: SizedBox(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Text(
otherPages[index].pageName ?? "-",
style: TextStyle(
fontSize: 14,
color: AppColors.app_blue,
fontFamily: "JakartaMedium",
), ),
Expanded(
flex: 1,
child: SvgPicture.asset(
"assets/svg/arrow_right_new.svg",
), ),
// Text(
// filteredPaymentAdministrations[ad]['subtitle'] ??
// "-",
// maxLines: 2,
// style: TextStyle(
// fontSize: 12,
// color: AppColors.grey_semi,
// fontFamily: "JakartaMedium",
// ),
// ),
],
), ),
),
),
SizedBox(width: 10),
Expanded(flex: 1, child: SvgIcon),
], ],
), ),
), ),
); );
}, },
), ),
SizedBox(height: 75,) ],
SizedBox(height: 75),
], ],
), ),
), ),
...@@ -353,9 +799,6 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> { ...@@ -353,9 +799,6 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
); );
} }
Widget _scaffold1(BuildContext context) { Widget _scaffold1(BuildContext context) {
return Consumer<Pagesdashboardprovider>( return Consumer<Pagesdashboardprovider>(
builder: (context, provider, child) { builder: (context, provider, child) {
...@@ -608,9 +1051,6 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> { ...@@ -608,9 +1051,6 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
); );
} }
Future<void> _showPaymentOptionsSheet(BuildContext context) { Future<void> _showPaymentOptionsSheet(BuildContext context) {
return showModalBottomSheet( return showModalBottomSheet(
useSafeArea: true, useSafeArea: true,
...@@ -645,47 +1085,57 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> { ...@@ -645,47 +1085,57 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
...List.generate(pages2.length, (index) { ...List.generate(pages2.length, (index) {
print(pages2[index].mode); print(pages2[index].mode);
// "assets/svg/crm/open_leads_ic.svg"
//"assets/svg/finance/fin_receipts_ic.svg"
//"assets/svg/finance/fin_payments_ic.svg"
final icons = [
"assets/svg/finance/other_payment_ic.svg",
"assets/svg/finance/fin_accounts_ic.svg",
"assets/svg/finance/fin_payments_ic.svg",
];
return ListTile( return ListTile(
onTap: () async { onTap: () async {
var res; var res;
if (pages2[index] if (pages2[index].pageName!.contains(
.pageName!.contains("Add Order")) { "Add Order",
)) {
res = await Navigator.push( res = await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: builder:
( (context) => AddorderScreen(
context,
) => AddorderScreen(
mode: pages2[index].mode!, mode: pages2[index].mode!,
pageTitleName: pages2[index].pageName!, pageTitleName:
pages2[index].pageName!,
), ),
settings: RouteSettings( settings: RouteSettings(
name: "AddorderScreen", name: "AddorderScreen",
), ),
), ),
); );
} else if (pages2[index].pageName!.contains("Add Receipt")) { } else if (pages2[index].pageName!.contains(
"Add Receipt",
)) {
res = await Navigator.push( res = await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: builder:
(context) => AddpaymentScreen( (context) => AddpaymentScreen(
mode: pages2[index].mode!, mode: pages2[index].mode!,
pageTitleName: pages2[index].pageName!, pageTitleName:
pages2[index].pageName!,
), ),
settings: RouteSettings( settings: RouteSettings(
name: "AddpaymentScreen", name: "AddpaymentScreen",
), ),
), ),
); );
} else if (pages2[index].pageName == "Add TPC Agent") { } else if (pages2[index].pageName ==
"Add TPC Agent") {
res = await Navigator.push( res = await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: builder: (context) => AddtpcagentScreen(),
(context) =>AddtpcagentScreen(),
settings: RouteSettings( settings: RouteSettings(
name: "AddtpcagentScreen", name: "AddtpcagentScreen",
), ),
...@@ -739,7 +1189,7 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> { ...@@ -739,7 +1189,7 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
Navigator.pop(context); Navigator.pop(context);
}, },
leading: SvgPicture.asset( leading: SvgPicture.asset(
"assets/svg/fin_ic.svg", icons[index],
), ),
title: Text( title: Text(
"${pages2[index].pageName}", "${pages2[index].pageName}",
......
lib/screens/order/ordersDetailsByModes.dart
View file @ b5225d58
...@@ -515,12 +515,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -515,12 +515,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
? "Order Details" ? "Order Details"
: "Order Details (${widget.mode})", : "Order Details (${widget.mode})",
provider.resetAll, provider.resetAll,
InkResponse( SizedBox.shrink(),
onTap: () {
_showOptionsSheet(context);
},
child: SvgPicture.asset("assets/svg/ic_more.svg", height: 30),
),
0xFFFFFFFF, 0xFFFFFFFF,
), ),
backgroundColor: AppColors.scaffold_bg_color, backgroundColor: AppColors.scaffold_bg_color,
...@@ -873,19 +868,19 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -873,19 +868,19 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
SizedBox( SizedBox(
width: double.infinity, width: double.infinity,
height: 130, height: 300,
child: ListView.builder( child: ListView.builder(
physics: AlwaysScrollableScrollPhysics(), physics: AlwaysScrollableScrollPhysics(),
shrinkWrap: true, shrinkWrap: true,
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
vertical: 10, vertical: 5,
horizontal: 10, horizontal: 10,
), ),
itemCount: productsHistory.length, itemCount: productsHistory.length,
itemBuilder: (context, lp) { itemBuilder: (context, lp) {
return Container( return Container(
height: 130, height: 300,
width: width:
MediaQuery.of(context).size.width * 0.9, MediaQuery.of(context).size.width * 0.9,
decoration: BoxDecoration( decoration: BoxDecoration(
...@@ -902,7 +897,9 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -902,7 +897,9 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
// vertical: 10, // vertical: 10,
), ),
child: Row( child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
...@@ -957,7 +954,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -957,7 +954,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
fontSize: 14, fontSize: 14,
color: color:
AppColors AppColors
.semi_black, .app_blue,
), ),
), ),
), ),
...@@ -972,26 +969,259 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -972,26 +969,259 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
), ),
), ),
SizedBox(height: 5), SizedBox(height: 5),
DottedLine( // DottedLine(
// dashGapLength: 4,
// dashGapColor: Colors.white,
// dashColor: AppColors.grey_semi,
// dashLength: 2,
// lineThickness: 0.5,
// ),
// SizedBox(height: 5),
// Text(
// "₹${productsHistory[lp].totalPrice ?? " - "}",
// style: TextStyle(
// fontFamily: "JakartaMedium",
// fontSize: 14,
// color: AppColors.semi_black,
// ),
// ),
],
),
),
),
],
),
Container(
padding: EdgeInsets.symmetric(
vertical: 7.5,
),
child: Row(
children: [
Expanded(
flex: 3,
child: Text(
"Tax Details",
style: TextStyle(
fontSize: 14,
fontFamily: "JakartaSemiBold",
),
),
),
Expanded(
flex: 7,
child: DottedLine(
dashGapLength: 4, dashGapLength: 4,
dashGapColor: Colors.white, dashGapColor: Colors.white,
dashColor: AppColors.grey_semi, dashColor: AppColors.grey_semi,
dashLength: 2, dashLength: 2,
lineThickness: 0.5, lineThickness: 0.5,
), ),
SizedBox(height: 5), ),
Text( ],
"₹${productsHistory[lp].totalPrice ?? " - "}", ),
),
...List.generate(3, (j) {
final heads = [
"CGST (%)",
"SGST (%)",
"IGST (%)",
];
final subHeads = [
productsHistory[lp].cgstPercentage ?? "-",
productsHistory[lp].sgstPercentage ?? "-",
productsHistory[lp].igstPercentage ?? "-",
];
return Container(
padding: EdgeInsets.symmetric(
vertical: 3,
),
child: Row(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Expanded(
child: Text(
textAlign: TextAlign.left,
heads[j],
style: TextStyle( style: TextStyle(
fontFamily: "JakartaMedium", fontFamily:
"JakartaRegular",
fontSize: 14, fontSize: 14,
color: AppColors.semi_black, color: AppColors.semi_black,
), ),
), ),
),
if (subHeads[j] == "View") ...[
Expanded(
child: InkResponse(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder:
(
context,
) => Fileviewer(
fileName:
feedbackHistory[lp].attachmentViewFileName!,
fileUrl:
feedbackHistory[lp].attachmentDirFilePath!,
),
),
);
},
child: Text(
textAlign:
TextAlign.right,
subHeads[j] == ""
? "-"
: subHeads[j],
style: TextStyle(
fontSize: 14,
color:
AppColors.app_blue,
decorationColor:
AppColors.app_blue,
decoration:
TextDecoration
.underline,
),
),
),
),
] else ...[
Expanded(
child: Text(
textAlign: TextAlign.right,
subHeads[j] == ""
? "-"
: subHeads[j],
style: TextStyle(
fontSize: 14,
color: Color(0xFF818181),
),
),
),
], ],
],
),
);
}),
Container(
padding: EdgeInsets.symmetric(
vertical: 7.5,
),
child: Row(
children: [
Expanded(
flex: 3,
child: Text(
"Price Details",
style: TextStyle(
fontSize: 14,
fontFamily: "JakartaSemiBold",
),
),
),
Expanded(
flex: 7,
child: DottedLine(
dashGapLength: 4,
dashGapColor: Colors.white,
dashColor: AppColors.grey_semi,
dashLength: 2,
lineThickness: 0.5,
),
),
],
),
), ),
...List.generate(2, (j) {
final heads = [
"Unit Price",
"Total Price"
];
final subHeads = [
"₹ ${productsHistory[lp].unitPrice ?? "-"}",
"₹ ${productsHistory[lp].totalPrice ?? "-"}",
];
return Container(
padding: EdgeInsets.symmetric(
vertical: 3,
),
child: Row(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Expanded(
child: Text(
textAlign: TextAlign.left,
heads[j],
style: TextStyle(
fontFamily:
"JakartaRegular",
fontSize: 14,
color: AppColors.semi_black,
), ),
), ),
),
if (subHeads[j] == "View") ...[
Expanded(
child: InkResponse(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder:
(
context,
) => Fileviewer(
fileName:
feedbackHistory[lp].attachmentViewFileName!,
fileUrl:
feedbackHistory[lp].attachmentDirFilePath!,
),
),
);
},
child: Text(
textAlign:
TextAlign.right,
subHeads[j] == ""
? "-"
: subHeads[j],
style: TextStyle(
fontSize: 14,
color:
AppColors.app_blue,
decorationColor:
AppColors.app_blue,
decoration:
TextDecoration
.underline,
),
),
),
),
] else ...[
Expanded(
child: Text(
textAlign: TextAlign.right,
subHeads[j] == ""
? "-"
: subHeads[j],
style: TextStyle(
fontSize: 14,
color: Color(0xFF818181),
),
),
),
],
],
),
);
}),
], ],
), ),
); );
...@@ -1329,6 +1559,8 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -1329,6 +1559,8 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
], ],
///PaymentHistory details ///PaymentHistory details
if (paymentHistory.isNotEmpty) ...[
Container( Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 10, left: 10,
...@@ -1352,7 +1584,6 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -1352,7 +1584,6 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
], ],
), ),
), ),
if (paymentHistory.isNotEmpty) ...[
SizedBox( SizedBox(
width: double.infinity, width: double.infinity,
height: 225, height: 225,
...@@ -1599,11 +1830,12 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -1599,11 +1830,12 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
), ),
bottomNavigationBar: bottomNavigationBar:
["self", "pending_approval"].contains(widget.mode) ["self", "pending_approval"].contains(widget.mode)
? Container(height: 0) ? SizedBox.shrink()
: Container( : Container(
margin: EdgeInsets.symmetric(horizontal: 10), decoration: BoxDecoration(color: Colors.white),
padding: EdgeInsets.symmetric(horizontal: 10),
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
height: 60, height: 75,
child: Container( child: Container(
margin: EdgeInsets.only(bottom: 10), margin: EdgeInsets.only(bottom: 10),
alignment: Alignment.center, alignment: Alignment.center,
...@@ -1625,21 +1857,31 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -1625,21 +1857,31 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
); );
}, },
child: Container( child: Container(
decoration: BoxDecoration( // decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8), // borderRadius: BorderRadius.circular(8),
color: Color(0xFFFFEFEF), // color: Color(0xFFFFEFEF),
border: Border.all( // border: Border.all(
color: Color(0xFFED3424), // color: Color(0xFFED3424),
width: 0.5, // width: 0.5,
), // ),
// ),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset(
"assets/svg/finance/level_reject_ic.svg",
), ),
child: Center( SizedBox(width: 5,),
Center(
child: Text( child: Text(
"Reject", "Reject",
style: TextStyle( style: TextStyle(
color: Color(0xFFED3424), color: AppColors.semi_black,
fontSize: 14,
),
), ),
), ),
],
), ),
), ),
), ),
...@@ -1652,6 +1894,10 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -1652,6 +1894,10 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
"level_two_rejected", "level_two_rejected",
"sales_order_registered", "sales_order_registered",
].contains(widget.mode)) ...[ ].contains(widget.mode)) ...[
SvgPicture.asset(
"assets/svg/crm/vertical_line_ic.svg",
),
SizedBox(width: 10),
Expanded( Expanded(
child: InkResponse( child: InkResponse(
onTap: () { onTap: () {
...@@ -1666,28 +1912,43 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -1666,28 +1912,43 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
); );
}, },
child: Container( child: Container(
decoration: BoxDecoration( // decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8), // borderRadius: BorderRadius.circular(8),
color: Color(0xFFE7FFE5), // color: Color(0xFFE7FFE5),
border: Border.all( // border: Border.all(
color: Color(0xFF0D9C00), // color: Color(0xFF0D9C00),
width: 0.5, // width: 0.5,
), // ),
// ),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset(
"assets/svg/finance/level_approve_ic.svg",
), ),
child: Center( SizedBox(width: 5,),
Center(
child: Text( child: Text(
"Approve", "Approve",
style: TextStyle( style: TextStyle(
color: Color(0xFF0D9C00), color: AppColors.semi_black,
fontSize: 14,
),
), ),
), ),
],
), ),
), ),
), ),
), ),
SizedBox(width: 10),
], ],
if (["admin"].contains(widget.mode)) ...[ if (["admin"].contains(widget.mode)) ...[
SvgPicture.asset(
"assets/svg/crm/vertical_line_ic.svg",
),
SizedBox(width: 10),
Expanded( Expanded(
child: InkResponse( child: InkResponse(
onTap: () { onTap: () {
...@@ -1702,19 +1963,32 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -1702,19 +1963,32 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
width: 0.5, width: 0.5,
), ),
), ),
child: Center( child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset("assets/svg/finance/level_delete_ic.svg"),
SizedBox(width: 5,),
Center(
child: Text( child: Text(
"Delete", "Delete",
style: TextStyle( style: TextStyle(
color: Color(0xFFED3424), color: AppColors.semi_black,
fontSize: 14,
), ),
), ),
), ),
],
), ),
), ),
), ),
),
SizedBox(width: 10),
], ],
if (widget.mode == "dispatched") ...[ if (widget.mode == "dispatched") ...[
SvgPicture.asset(
"assets/svg/crm/vertical_line_ic.svg",
),
SizedBox(width: 10),
Expanded( Expanded(
child: InkResponse( child: InkResponse(
onTap: () { onTap: () {
...@@ -1735,14 +2009,20 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -1735,14 +2009,20 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
width: 0.5, width: 0.5,
), ),
), ),
child: Center( child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Center(
child: Text( child: Text(
"Dispatch", "Dispatch",
style: TextStyle( style: TextStyle(
color: Color(0xFFED3424), color: AppColors.semi_black,
fontSize: 14,
), ),
), ),
), ),
],
),
), ),
), ),
), ),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment