From 787619b90707f915308f82e1055a54ee93dbf39a Mon Sep 17 00:00:00 2001 From: Asif Takavala Date: Fri, 1 Apr 2022 10:24:56 +0000 Subject: [PATCH] add v-calendar --- package.json | 1 + .../custom-fields/types/DateTimeType.vue | 2 +- .../create/EstimateCreateBasicFields.vue | 2 + .../create/InvoiceCreateBasicFields.vue | 2 + .../components/base/BaseDatePicker.vue | 262 +++++++++++++----- resources/scripts/locales/en.json | 12 +- yarn.lock | 33 ++- 7 files changed, 235 insertions(+), 79 deletions(-) diff --git a/package.json b/package.json index 87db66fe..ac8a1440 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "mini-svg-data-uri": "^1.3.3", "moment": "^2.29.1", "pinia": "^2.0.4", + "v-calendar": "3.0.0-alpha.8", "v-money3": "3.16.1", "v-tooltip": "^4.0.0-alpha.1", "vue": "^3.2.0-beta.5", diff --git a/resources/scripts/admin/components/custom-fields/types/DateTimeType.vue b/resources/scripts/admin/components/custom-fields/types/DateTimeType.vue index f29a01ab..cf672c9c 100644 --- a/resources/scripts/admin/components/custom-fields/types/DateTimeType.vue +++ b/resources/scripts/admin/components/custom-fields/types/DateTimeType.vue @@ -9,7 +9,7 @@ import { computed } from 'vue' const props = defineProps({ modelValue: { type: String, - default: moment().format('YYYY-MM-DD hh:MM'), + default: moment().format('YYYY-MM-DD HH:mm'), }, }) diff --git a/resources/scripts/admin/views/estimates/create/EstimateCreateBasicFields.vue b/resources/scripts/admin/views/estimates/create/EstimateCreateBasicFields.vue index 40485425..663e7b7d 100644 --- a/resources/scripts/admin/views/estimates/create/EstimateCreateBasicFields.vue +++ b/resources/scripts/admin/views/estimates/create/EstimateCreateBasicFields.vue @@ -32,6 +32,8 @@ :content-loading="isLoading" :calendar-button="true" calendar-button-icon="calendar" + :show-extra-options="true" + :source-date="estimateStore.newEstimate.estimate_date" /> diff --git a/resources/scripts/admin/views/invoices/create/InvoiceCreateBasicFields.vue b/resources/scripts/admin/views/invoices/create/InvoiceCreateBasicFields.vue index 9181b573..ab01156d 100644 --- a/resources/scripts/admin/views/invoices/create/InvoiceCreateBasicFields.vue +++ b/resources/scripts/admin/views/invoices/create/InvoiceCreateBasicFields.vue @@ -32,6 +32,8 @@ :content-loading="isLoading" :calendar-button="true" calendar-button-icon="calendar" + :show-extra-options="true" + :source-date="invoiceStore.newInvoice.invoice_date" /> diff --git a/resources/scripts/components/base/BaseDatePicker.vue b/resources/scripts/components/base/BaseDatePicker.vue index c6eb24f1..250ae51f 100644 --- a/resources/scripts/components/base/BaseDatePicker.vue +++ b/resources/scripts/components/base/BaseDatePicker.vue @@ -7,52 +7,108 @@ /> -
- - - - - - - + + :mode="mode" + :is24hr="time24hr" + class="w-full" + color="indigo" + :input-debounce="500" + :update-on-input="false" + :is-range="false" + trim-weeks + :is-required="isRequired" + :popover="{ + visibility: disabled ? 'hidden' : 'focus', + showDelay: 0, + hideDelay: 1, + }" + :attributes="attrs" + :model-config="config" + :masks="masks" + :locale="global.locale" + > + + + +
+ + diff --git a/resources/scripts/locales/en.json b/resources/scripts/locales/en.json index a462b9fb..b2f475ab 100644 --- a/resources/scripts/locales/en.json +++ b/resources/scripts/locales/en.json @@ -1527,5 +1527,13 @@ "pdf_bill_to": "Bill to,", "pdf_ship_to": "Ship to,", "pdf_received_from": "Received from:", - "pdf_tax_label": "Tax" -} \ No newline at end of file + "pdf_tax_label": "Tax", + "date_picker": { + "same_day": "Same Day", + "within_7_days": "Within 7 Days", + "within_15_days": "Within 15 Days", + "within_30_days": "Within 30 Days", + "within_45_days": "Within 45 Days", + "within_60_days": "Within 60 Days" + } +} diff --git a/yarn.lock b/yarn.lock index 85411b8a..2f0cb4bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -156,6 +156,11 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@popperjs/core@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.4.0.tgz#0e1bdf8d021e7ea58affade33d9d607e11365915" + integrity sha512-NMrDy6EWh9TPdSRiHmHH2ye1v5U0gBD7pRYwSwJvomx7Bm4GG04vu63dYiVzebLOx2obPpJugew06xVP0Nk7hA== + "@popperjs/core@^2.10.1", "@popperjs/core@^2.11.0", "@popperjs/core@^2.9.0", "@popperjs/core@^2.9.2": version "2.11.4" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz#d8c7b8db9226d2d7664553a0741ad7d0397ee503" @@ -378,6 +383,11 @@ prosemirror-state "^1.3.4" prosemirror-view "^1.23.6" +"@types/lodash@^4.14.165": + version "4.14.179" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.179.tgz#490ec3288088c91295780237d2497a3aa9dfb5c5" + integrity sha512-uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w== + "@types/orderedmap@*": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/orderedmap/-/orderedmap-1.0.0.tgz#807455a192bba52cbbb4517044bc82bdbfa8c596" @@ -928,6 +938,16 @@ csstype@^2.6.8: resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.20.tgz#9229c65ea0b260cf4d3d997cb06288e36a8d6dda" integrity sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA== +date-fns-tz@^1.0.12: + version "1.3.0" + resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-1.3.0.tgz#6c83d4bdf20d54060cf176d96a3ca45043b36a84" + integrity sha512-r6ye6PmGEvkF467/41qzU71oGwv9kHTnV3vtSZdyV6VThwPID47ZH7FtR7zQWrhgOUWkYySm2ems2w6ZfNUqoA== + +date-fns@^2.16.1: + version "2.28.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2" + integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw== + debug@=3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" @@ -1663,7 +1683,7 @@ lodash.truncate@^4.4.2: resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= -lodash@^4.17.13, lodash@^4.17.21: +lodash@^4.17.13, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -2344,6 +2364,17 @@ util-deprecate@^1.0.2: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= +v-calendar@3.0.0-alpha.8: + version "3.0.0-alpha.8" + resolved "https://registry.yarnpkg.com/v-calendar/-/v-calendar-3.0.0-alpha.8.tgz#3bc8c69f4788fb527c39706f41fd2a502a17c827" + integrity sha512-T23H5UbK0EomrwArlF/jrT2LFbV/lu+Bp9JroZ1paN6rPoaMyvE+HrLxvAmUgi+pODrdTURDMzM3+WPgeFKEBQ== + dependencies: + "@popperjs/core" "2.4.0" + "@types/lodash" "^4.14.165" + date-fns "^2.16.1" + date-fns-tz "^1.0.12" + lodash "^4.17.20" + v-money3@3.16.1: version "3.16.1" resolved "https://registry.yarnpkg.com/v-money3/-/v-money3-3.16.1.tgz#1cbc126792772ddd9f0d9605745961bae29f2e5a"