Skip to content

Commit

Permalink
Feat:Role restriction in captain-transfer and Billing,Update:Refine UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sanjusha-tridz
Sanjusha-tridz committed Jan 6, 2024
1 parent ae5c939 commit 9c7de2d
Show file tree
Hide file tree
Showing 22 changed files with 783 additions and 412 deletions.
2 changes: 1 addition & 1 deletion ...os/public/urypos/assets/Login-84bd5e5c.js → ...os/public/urypos/assets/Login-69524df1.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion ury_pos/public/urypos/assets/index-6802fdee.css
View file

This file was deleted.

1 change: 1 addition & 0 deletions ury_pos/public/urypos/assets/index-9f0cb04f.css
View file

Large diffs are not rendered by default.

112 changes: 56 additions & 56 deletions ...os/public/urypos/assets/index-e7973cdd.js → ...os/public/urypos/assets/index-de092df6.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ury_pos/public/urypos/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<link rel="icon" type="image/svg+xml" href="/assets/ury_pos/urypos/URY.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>URY POS</title>
<script type="module" crossorigin src="/assets/ury_pos/urypos/assets/index-e7973cdd.js"></script>
<link rel="stylesheet" href="/assets/ury_pos/urypos/assets/index-6802fdee.css">
<script type="module" crossorigin src="/assets/ury_pos/urypos/assets/index-de092df6.js"></script>
<link rel="stylesheet" href="/assets/ury_pos/urypos/assets/index-9f0cb04f.css">
</head>
<body>
<div id="app"></div>
Expand Down
Empty file added ury_pos/www/__init__.py
View file
Empty file.
4 changes: 2 additions & 2 deletions ury_pos/www/urypos.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<link rel="icon" type="image/svg+xml" href="/assets/ury_pos/urypos/URY.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>URY POS</title>
<script type="module" crossorigin src="/assets/ury_pos/urypos/assets/index-e7973cdd.js"></script>
<link rel="stylesheet" href="/assets/ury_pos/urypos/assets/index-6802fdee.css">
<script type="module" crossorigin src="/assets/ury_pos/urypos/assets/index-de092df6.js"></script>
<link rel="stylesheet" href="/assets/ury_pos/urypos/assets/index-9f0cb04f.css">
</head>
<body>
<div id="app"></div>
Expand Down
71 changes: 69 additions & 2 deletions urypos/src/components/Cart.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
</button> -->
<button
class="rounded px-4 py-2 shadow"
@click="this.invoiceData.cancelInvoice()"
@click="this.invoiceData.showCancelInvoiceModal()"

>
Cancel
</button>
Expand Down Expand Up @@ -101,11 +102,77 @@
/>
</div>

<div
v-if="this.invoiceData.cancelInvoiceFlag === true"
class="fixed inset-0 z-10 mt-20 overflow-y-auto bg-gray-100"
>
<div class="mt-20 flex items-center justify-center">
<div class="w-full rounded-lg bg-white p-6 shadow-lg md:max-w-md">
<div class="flex justify-end">
<span class="sr-only">Close</span>
<svg
xmlns="http://www.w3.org/2000/svg"
class="h-5 w-5"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
@click="this.invoiceData.cancelInvoiceFlag = false"
>
<path
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M6 18L18 6M6 6l12 12"
/>
</svg>
</div>
<h2
class="mt-1 block text-left text-xl font-medium text-gray-900 dark:text-white"
>
Are you sure to cancel
</h2>
<div class="relative">
<label
for="cancelReason"
class="mt-6 block text-left text-gray-900 dark:text-white"
>
Reason
</label>
<input
type="text"
id="cancelReason"
class="mt-4 w-full appearance-none rounded border p-2 leading-tight text-gray-900 shadow focus:outline-none"
v-model="this.invoiceData.cancelReason"
/>
</div>
<div class="flex justify-end">
<button
@click="this.invoiceData.cancelInvoiceFlag = false"
class="mr-3 mt-6 rounded border border-gray-300 bg-gray-50 px-3 py-2"
>
No
</button>
<button
@click="
this.invoiceData.cancelInvoice();
this.invoiceData.cancelInvoiceFlag = false;
"
class="mt-6 rounded bg-blue-500 px-3 py-2 text-white hover:bg-blue-600"
>
Yes
</button>
</div>
</div>
</div>
</div>



<div
v-if="menu.showDialogCart"
class="fixed inset-0 mt-20 z-10 overflow-y-auto bg-gray-100"
>
<div class="mt-3 flex items-center justify-center">
<div class="mt-10 flex items-center justify-center">
<div class="w-full rounded-lg bg-white p-6 shadow-lg md:max-w-md">
<div class="flex justify-end">
<span class="sr-only">Close</span>
Expand Down
52 changes: 25 additions & 27 deletions urypos/src/components/Customer.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@
</div>
<input
type="text"
id="customerName"
class="block w-full rounded-lg border border-gray-300 bg-gray-50 p-2.5 pl-10 text-sm text-gray-900 focus:border-blue-500 focus:ring-blue-500 dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:placeholder-gray-400 dark:focus:border-blue-500 dark:focus:ring-blue-500 md:w-3/5 lg:w-2/5"
placeholder="Search Customers"
v-model="this.customers.search"
@input="this.customers.pickCustomer()"
@click="this.customers.showCustomers = true"
@click="this.customers.showCustomers = true;this.customers.showAddNewCustomer= true"
required
/>

Expand All @@ -49,7 +48,7 @@
{{ customer.name }}
</h1>
<h2 class="text-sm leading-normal">
{{ customer.name }}
{{ customer.name }}
{{
customer.content
? this.customers.extractName(customer.content)
Expand All @@ -62,8 +61,7 @@
href="#"
class="mt-4 inline-flex items-center text-blue-600 hover:underline"
@click.prevent="
this.customers.showModalNewCustomer = true;
this.customers.newCustomerData(this.customers.search);
this.customers.newCustomerData(this.customers.search)
"
>
<svg
Expand All @@ -87,28 +85,28 @@
</div>
<div
v-if="this.customers.showModalNewCustomer"
class="fixed inset-0 mt-20 z-10 overflow-y-auto bg-gray-100"
class="fixed inset-0 z-10 mt-20 overflow-y-auto bg-gray-100"
>
<div class="mt-3 flex items-center justify-center">
<div class="mt-10 flex items-center justify-center">
<div class="w-full rounded-lg bg-white p-6 shadow-lg md:max-w-md">
<div class="flex justify-end">
<span class="sr-only">Close</span>
<svg
xmlns="http://www.w3.org/2000/svg"
class="h-5 w-5"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
@click="this.customers.showModalNewCustomer = false"
>
<path
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M6 18L18 6M6 6l12 12"
/>
</svg>
</div>
<span class="sr-only">Close</span>
<svg
xmlns="http://www.w3.org/2000/svg"
class="h-5 w-5"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
@click="this.customers.showModalNewCustomer = false"
>
<path
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M6 18L18 6M6 6l12 12"
/>
</svg>
</div>

<h2
class="mt-1 block text-left text-xl font-medium text-gray-900 dark:text-white"
Expand Down Expand Up @@ -149,7 +147,7 @@
</label>
<input
type="text"
id="customer_name"
id="customerGroup"
class="mt-4 w-full rounded-lg border border-gray-300 bg-gray-50 text-sm text-gray-900 focus:border-blue-500 focus:ring-blue-500 dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:placeholder-gray-400 dark:focus:border-blue-500 dark:focus:ring-blue-500"
v-model="this.customers.customerGroup"
@click="
Expand Down Expand Up @@ -185,7 +183,7 @@
</label>
<input
type="text"
id="customer_name"
id="territory"
class="mt-4 w-full rounded-lg border border-gray-300 bg-gray-50 text-sm text-gray-900 focus:border-blue-500 focus:ring-blue-500 dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:placeholder-gray-400 dark:focus:border-blue-500 dark:focus:ring-blue-500"
v-model="this.customers.customerTerritory"
@click="
Expand Down Expand Up @@ -272,7 +270,7 @@
>
<img />
<div
class="cart-item-details sm:min-w-none grid w-full min-w-0 grid-cols-4 gap-2 py-2 sm:w-full md:w-full lg:w-full"
class="cart-item-details sm:min-w-none grid w-full min-w-0 grid-cols-4 gap-2 py-2 sm:w-full md:w-full lg:w-full"
>
<h3>{{ item.item_name }}</h3>

Expand Down
Loading

0 comments on commit 9c7de2d

Please sign in to comment.