spree_cm_commissioner 2.14.2 → 2.14.4

data/app/views/spree/admin/rates_availabilities/_script.html.erb

@@ -6,6 +6,8 @@
       selected: t('rates_availabilities.bulk.selected'),
       saving: t('rates_availabilities.bulk.saving'),
       done: t('rates_availabilities.bulk.done'),
+      busy: t('rates_availabilities.bulk.busy'),
+      useBaseStockConfirm: t('rates_availabilities.bulk.use_base_stock_confirm'),
       failed: t('rates_availabilities.modal.failed')
     }.to_json) %>;
 
@@ -228,7 +230,8 @@
       // close each rate on its own, and they'd stay closed after the date is reopened from its stock cell alone. A
       // price cell closed only by its date or the base rate (ra-closed-day alone) is in neither: it has no closing
       // of its own to reopen, and closing it would add one that shows only once those reopen.
-      // `datePrices` have their own price for the date, which Use Base price clears.
+      // `datePrices` have their own price for the date, which Use Base price clears. `dateStock` is what Use Base
+      // stock recounts: Base stock has nothing to fall back to.
       groups() {
         const cells = this.cells();
         const ofType = (type) => cells.filter((cell) => cell.dataset.cell === type);
@@ -247,7 +250,8 @@
           prices: prices,
           open: dated.filter((cell) => !isClosed(cell) && closesOnItsOwn(cell)),
           closed: dated.filter(isClosed),
-          datePrices: prices.filter((cell) => cell.classList.contains('ra-date-price'))
+          datePrices: prices.filter((cell) => cell.classList.contains('ra-date-price')),
+          dateStock: stock.filter((cell) => cell.dataset.date)
         };
       }
 
@@ -341,8 +345,9 @@
         this.load();
       }
 
-      // A newer request wins, as answers can arrive out of order while the search is typed.
-      load() {
+      // A newer request wins, as answers can arrive out of order while the search is typed. `notice` ({ text, level })
+      // goes above the reloaded list: the bulk bar, where a save reports, is under the modal.
+      load(notice = null) {
         const content = this.sharedModal.content;
         const seq = ++this.seq;
         const current = () => seq === this.seq && this.isShown;
@@ -359,6 +364,14 @@
           content.innerHTML = html;
           // Sync icons are popovers on stock managements, which nothing initializes in fetched HTML.
           content.querySelectorAll('[data-toggle="popover"]').forEach((el) => { el.title = el.dataset.content; });
+          const body = content.querySelector('.modal-body');
+          if (notice && body) {
+            const alert = document.createElement('div');
+            alert.className = 'alert alert-' + notice.level + ' py-2 small';
+            alert.setAttribute('role', 'status');
+            alert.textContent = notice.text;
+            body.prepend(alert);
+          }
           const search = content.querySelector('[data-ra-list-search]');
           if (searching && search) {
             search.focus();
@@ -424,6 +437,8 @@
         content.querySelector('[data-ra-bulk-count]').textContent = '· ' + groups[config.group].length;
         const useBase = content.querySelector('[data-ra-use-base]');
         if (useBase) useBase.hidden = !groups.datePrices.length;
+        const useBaseStock = content.querySelector('[data-ra-use-base-stock]');
+        if (useBaseStock) useBaseStock.hidden = !groups.dateStock.length;
         setTimeout(() => { const input = content.querySelector('input'); if (input) input.focus(); }, 300);
       }
 
@@ -438,11 +453,35 @@
         this.update('use_base_price', {}, this.cellSelection.groups().datePrices.map(cellData));
       }
 
+      // Recounting a date undoes the stock set on it, so this is Set stock's way back to Base, as Use Base price is
+      // for prices.
+      useBaseStock() {
+        const cells = this.cellSelection.groups().dateStock;
+        if (!window.confirm(T.useBaseStockConfirm.replace('%{count}', cells.length))) return;
+        this.sharedModal.hide();
+        this.update('reset_stock', {}, cells.map(cellData));
+      }
+
       recount(button) {
         if (!window.confirm(button.dataset.raConfirm)) return;
         this.update('reset_stock', {}, [{ type: 'stock', variant_id: button.dataset.variantId, rate_plan_id: null, date: button.dataset.date }]);
       }
 
+      // Every row of the open stock details: one stock cell per variant and date it was opened for, as its price
+      // cells list the same rows but reset_stock only takes stock cells.
+      recountAll(button) {
+        if (!window.confirm(button.dataset.raConfirm)) return;
+        const rows = new Map(this.cellListModal.request.cells.map((cell) => [cell.variant_id + '|' + cell.date, cell]));
+        const cells = [...rows.values()].map((cell) => ({ type: 'stock', variant_id: cell.variant_id, rate_plan_id: null, date: cell.date }));
+        this.update('reset_stock', {}, cells);
+      }
+
+      // In the bar, and above an open list modal, which covers the bar.
+      report(text, level) {
+        this.message(text, level === 'danger');
+        if (this.cellListModal.isShown) this.cellListModal.load({ text: text, level: level });
+      }
+
       // `cells` defaults to the selection. Reloads the grid, and an open list modal, as their counts change.
       update(action, values, cells = this.cellSelection.groups().all.map(cellData)) {
         this.bar.classList.add('ra-busy');
@@ -454,11 +493,12 @@
         }).then((response) => response.json().then((body) => {
           if (!response.ok) throw new Error(body.error);
           return this.monthTables.reload().then(() => {
-            if (this.cellListModal.isShown) this.cellListModal.load();
-            this.message(T.done.replace('%{updated}', body.updated).replace('%{skipped}', body.skipped));
+            const done = T.done.replace('%{updated}', body.updated).replace('%{skipped}', body.skipped);
+            if (body.busy) this.report(done + '. ' + T.busy.replace('%{count}', body.busy), 'warning');
+            else this.report(done, 'success');
           });
         })).catch((error) => {
-          this.message(error.message, true);
+          this.report(error.message, 'danger');
         }).finally(() => {
           this.bar.classList.remove('ra-busy');
         });
@@ -593,10 +633,12 @@
           ['[data-ra-select-date]', (el, event) => this.cellSelection.selectDate(el, event.shiftKey)],
           ['[data-ra-bulk]', (el) => this.bulkEditBar.start(el.dataset.raBulk)],
           ['[data-ra-use-base]', () => this.bulkEditBar.useBasePrice()],
+          ['[data-ra-use-base-stock]', () => this.bulkEditBar.useBaseStock()],
           ['[data-ra-list]', (el) => this.cellListModal.open(this.monthTables.root.dataset[el.dataset.raList + 'Url'])],
           ['[data-ra-list-filter]', (el) => this.cellListModal.setFilter(el.dataset.raListFilter)],
           ['[data-ra-list-page]', (el) => this.cellListModal.setPage(el)],
           ['[data-ra-recount]', (el) => this.bulkEditBar.recount(el)],
+          ['[data-ra-recount-all]', (el) => this.bulkEditBar.recountAll(el)],
           ['[data-ra-modal-url]', (el) => this.ratePlanForms.open(el.dataset.raModalUrl)],
           ['[data-ra-move]', (el) => this.ratePlanForms.moveItem(el)],
           ['[data-ra-delete-url]', (el) => this.ratePlanForms.destroy(el)]

data/app/views/spree/admin/rates_availabilities/index.html.erb

@@ -102,6 +102,10 @@
       <small class="text-muted"><%= t('rates_availabilities.bulk.stock_hint') %></small>
     </div>
     <div class="modal-footer">
+      <%# Only while dated stock is selected (BulkEditBar#openForm); recounts those dates, undoing the stock set on them. %>
+      <button type="button" class="mr-auto btn btn-outline-secondary" data-ra-use-base-stock hidden title="<%= t('rates_availabilities.bulk.use_base_stock_hint') %>">
+        <%= t('rates_availabilities.bulk.use_base_stock') %>
+      </button>
       <button type="button" class="btn btn-outline-secondary" data-ra-dismiss><%= t('rates_availabilities.rate_plan_form.cancel') %></button>
       <button type="submit" class="btn btn-primary"><%= t('rates_availabilities.rate_plan_form.save') %></button>
     </div>

data/app/views/spree/admin/shared/_api_cache_button.html.erb

@@ -0,0 +1,5 @@
+<%# locals: model (an ApiCaches::Invalidate::SUPPORTED_MODELS key), id (one record), tenant_id (with
+    no id, clears every record of model on that tenant's API; neither clears the BookMe+ storefront). %>
+<% id ||= nil %>
+<% tenant_id ||= nil %>
+<%= button_link_to Spree.t(:clear_cache), clear_admin_api_caches_path(model: model, id: id, tenant_id: tenant_id), method: :post, class: 'btn btn-outline-primary' %>

data/config/locales/en.yml

@@ -2,6 +2,16 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 en:
   views:
+    admin:
+      guests:
+        dynamic_fields:
+          title: "Custom fields"
+          stages:
+            pre_registration: "Before registration"
+            post_registration: "After registration"
+            during_check_in: "During check-in"
+          "yes": "Yes"
+          "no": "No"
     manage_team:
       add:
         user_not_found: "User not found"
@@ -265,6 +275,7 @@ en:
     riel: "៛"
 
   spree:
+    clear_cache_requested: "Clearing cache. Changes appear in the app within about a minute."
     default_inventory: "Default Inventory"
     title: "Title"
     confirm_clone_customer_notification: "Are you sure you want to clone \"%{title}\"?"
@@ -1220,6 +1231,10 @@ en:
     convert:
       hold_expired: "Your reservation expired before payment completed. Please try booking again."
 
+  inventory_item:
+    reset:
+      busy: "Stock changed while it was being recounted, as someone is booking it. Try again in a moment."
+
   # Displayed as-is on stock-status badges pushed to Firestore (see
   # SpreeCmCommissioner::Products::PublishStockStatusToFirestore) — not read via I18n at request
   # time, so every locale we publish for must have an entry here.
@@ -1636,7 +1651,12 @@ en:
       close: "Close sale"
       reopen: "Reopen sale"
       reset_stock: "Recount stock"
-      reset_stock_confirm: "Recount stock? Available and on-hold are recalculated from base stock and orders."
+      reset_stock_confirm: "Recount stock? Available and on-hold are recalculated from Base stock and orders, which undoes stock set on the date."
+      recount_limit: "Recount up to %{max} dates at a time"
+      busy: "%{count} were being booked and were left as they were; try them again in a moment."
+      use_base_stock: "Use Base stock"
+      use_base_stock_hint: "Recount the selected dates from Base stock and orders, undoing the stock set on them"
+      use_base_stock_confirm: "Recount %{count} selected dates from Base stock and orders? Stock set on them is undone."
       deselect: "Deselect all"
       selected: "%{count} selected"
       saving: "Saving…"
@@ -1720,6 +1740,10 @@ en:
       title: "Stock details"
       date: "Date"
       none: "No inventory for the selected dates."
+      recount_all: "Recount all"
+      recount_all_hint: "Recalculates from Base stock and orders: fixes drifted counts and undoes stock set on these dates."
+      recount_all_confirm: "Recount all %{count} rows? Available and on-hold are recalculated from Base stock and orders, which undoes stock set on those dates."
+      recount_all_limit: "Select up to %{max} rows to recount them all at once"
     bookings:
       title: "Bookings"
       open: "Bookings"

data/config/locales/km.yml

@@ -3,6 +3,16 @@
 
 km:
   views:
+    admin:
+      guests:
+        dynamic_fields:
+          title: "ព័ត៌មានបន្ថែម"
+          stages:
+            pre_registration: "មុនចុះឈ្មោះ"
+            post_registration: "ក្រោយចុះឈ្មោះ"
+            during_check_in: "ពេលចូលរួម"
+          "yes": "បាទ/ចាស"
+          "no": "ទេ"
     manage_team:
       add:
         user_not_found: "រកមិនឃើញអ្នកប្រើប្រាស់"
@@ -222,6 +232,7 @@ km:
     riel: "៛"
 
   spree:
+    clear_cache_requested: "កំពុងសម្អាតឃ្លាំងទិន្នន័យ។ ការផ្លាស់ប្តូរនឹងបង្ហាញក្នុងកម្មវិធីក្នុងរយៈពេលប្រហែលមួយនាទី។"
     default_inventory: "ស្តុកលំនាំដើម"
     title: "ចំណងជើង"
     confirm_clone_customer_notification: "តើអ្នកប្រាកដថាចង់ចម្លង \"%{title}\" មែនទេ?"
@@ -740,6 +751,10 @@ km:
     convert:
       hold_expired: "ការកក់របស់អ្នកបានផុតកំណត់មុនពេលទូទាត់ប្រាក់បានបញ្ចប់។ សូមព្យាយាមកក់ម្តងទៀត។"
 
+  inventory_item:
+    reset:
+      busy: "ស្តុកបានផ្លាស់ប្តូរពេលកំពុងរាប់ឡើងវិញ ព្រោះមានអ្នកកំពុងកក់។ សូមព្យាយាមម្តងទៀតបន្តិចទៀត។"
+
   stock_status:
     pending_hold: "តម្រូវការខ្ពស់"
     sold_out: "លក់អស់"
@@ -1176,7 +1191,12 @@ km:
       close: "បិទការលក់"
       reopen: "បើកការលក់ឡើងវិញ"
       reset_stock: "រាប់ស្តុកឡើងវិញ"
-      reset_stock_confirm: "រាប់ស្តុកឡើងវិញ? ចំនួននៅសល់ និងកំពុងរក្សាទុកនឹងត្រូវគណនាឡើងវិញពីស្តុកមូលដ្ឋាន និងការកម្ម៉ង់។"
+      reset_stock_confirm: "រាប់ស្តុកឡើងវិញ? ចំនួននៅសល់ និងកំពុងរក្សាទុកនឹងត្រូវគណនាឡើងវិញពីស្តុកមូលដ្ឋាន និងការកម្ម៉ង់ ដែលលុបស្តុកដែលបានកំណត់លើថ្ងៃនោះ។"
+      recount_limit: "អាចរាប់ស្តុកឡើងវិញបានយ៉ាងច្រើន %{max} ថ្ងៃក្នុងមួយលើក"
+      busy: "%{count} កំពុងត្រូវបានកក់ ហើយមិនត្រូវបានប្តូរទេ។ សូមព្យាយាមម្តងទៀតបន្តិចទៀត។"
+      use_base_stock: "ប្រើស្តុកមូលដ្ឋាន"
+      use_base_stock_hint: "រាប់ស្តុកថ្ងៃដែលបានជ្រើសឡើងវិញពីស្តុកមូលដ្ឋាន និងការកម្ម៉ង់ ដោយលុបស្តុកដែលបានកំណត់លើថ្ងៃទាំងនោះ"
+      use_base_stock_confirm: "រាប់ស្តុក %{count} ថ្ងៃដែលបានជ្រើសឡើងវិញពីស្តុកមូលដ្ឋាន និងការកម្ម៉ង់? ស្តុកដែលបានកំណត់លើថ្ងៃទាំងនោះនឹងត្រូវលុប។"
       deselect: "ដកការជ្រើសទាំងអស់"
       selected: "បានជ្រើស %{count}"
       saving: "កំពុងរក្សាទុក…"
@@ -1260,6 +1280,10 @@ km:
       title: "ព័ត៌មានលម្អិតស្តុក"
       date: "ថ្ងៃ"
       none: "គ្មានស្តុកសម្រាប់ថ្ងៃដែលបានជ្រើសទេ។"
+      recount_all: "រាប់ទាំងអស់ឡើងវិញ"
+      recount_all_hint: "គណនាឡើងវិញពីស្តុកមូលដ្ឋាន និងការកម្ម៉ង់៖ កែចំនួនដែលខុស និងលុបស្តុកដែលបានកំណត់លើថ្ងៃទាំងនេះ។"
+      recount_all_confirm: "រាប់ស្តុកទាំង %{count} ជួរឡើងវិញ? ចំនួននៅសល់ និងកំពុងរក្សាទុកនឹងត្រូវគណនាឡើងវិញពីស្តុកមូលដ្ឋាន និងការកម្ម៉ង់ ដែលលុបស្តុកដែលបានកំណត់លើថ្ងៃទាំងនោះ។"
+      recount_all_limit: "ជ្រើសមិនលើស %{max} ជួរ ដើម្បីរាប់ទាំងអស់ឡើងវិញក្នុងមួយលើក"
     bookings:
       title: "ការកក់"
       open: "ការកក់"

data/config/routes.rb

@@ -20,7 +20,11 @@ Spree::Core::Engine.add_routes do
   end
 
   namespace :admin do
-    post '/invalidate_api_caches', to: 'base#invalidate_api_caches'
+    resources :api_caches, only: [] do
+      collection do
+        post :clear
+      end
+    end
 
     get '/system', to: redirect('/admin/system/waiting_room')
 

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.14.2'.freeze
+  VERSION = '2.14.4'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.14.2
+  version: 2.14.4
 platform: ruby
 authors:
 - You
@@ -824,6 +824,7 @@ files:
 - app/controllers/concerns/spree_cm_commissioner/turnstile_protectable.rb
 - app/controllers/concerns/spree_cm_commissioner/waiting_room_authorization.rb
 - app/controllers/spree/admin/account_deletions_controller.rb
+- app/controllers/spree/admin/api_caches_controller.rb
 - app/controllers/spree/admin/base_controller_decorator.rb
 - app/controllers/spree/admin/base_import_orders_controller.rb
 - app/controllers/spree/admin/blazer_queries_controller.rb
@@ -1370,6 +1371,7 @@ files:
 - app/jobs/spree_cm_commissioner/application_unique_job.rb
 - app/jobs/spree_cm_commissioner/async_operation_job.rb
 - app/jobs/spree_cm_commissioner/audit_event_job.rb
+- app/jobs/spree_cm_commissioner/audit_events/cleanup_expired_job.rb
 - app/jobs/spree_cm_commissioner/cancel_import_order_job.rb
 - app/jobs/spree_cm_commissioner/chatrace_order_creator_job.rb
 - app/jobs/spree_cm_commissioner/completion_steps/regenerate_for_line_items_job.rb
@@ -1872,6 +1874,7 @@ files:
 - app/overrides/spree/admin/cms_pages/index/cms_pages_tabs.html.erb.deface
 - app/overrides/spree/admin/menu_items/_form/badge_field.html.erb.deface
 - app/overrides/spree/admin/menus/edit/add_import_sprite_button.html.erb.deface
+- app/overrides/spree/admin/menus/index/clear_cache_button.html.erb.deface
 - app/overrides/spree/admin/oauth_applications/_form/tenant_fields.html.erb.deface
 - app/overrides/spree/admin/option_types/_form/attr_type.html.erb.deface
 - app/overrides/spree/admin/option_types/_form/checkbox.html.erb.deface
@@ -1896,6 +1899,7 @@ files:
 - app/overrides/spree/admin/orders/index/line_items_row.html.erb.deface
 - app/overrides/spree/admin/orders/index/row_actions.html.erb.deface
 - app/overrides/spree/admin/payment_methods/_form/display_on_field.html.erb.deface
+- app/overrides/spree/admin/payment_methods/index/clear_cache_button.html.erb.deface
 - app/overrides/spree/admin/payment_methods/index/pagination.html.erb.deface
 - app/overrides/spree/admin/payment_methods/index/preserve_tab_in_search.html.erb.deface
 - app/overrides/spree/admin/payments/_form/amount_text_field.html.erb.deface
@@ -2038,6 +2042,7 @@ files:
 - app/overrides/spree/admin/vendors/_form/star_rating.html.erb.deface
 - app/overrides/spree/admin/vendors/_form/term_of_use.html.erb.deface
 - app/overrides/spree/admin/vendors/_form/vendor_min_max_price.html.erb.deface
+- app/overrides/spree/admin/vendors/edit/clear_cache_button.html.erb.deface
 - app/overrides/spree/admin/vendors/edit/vendor_tabs.html.erb.deface
 - app/overrides/spree/admin/vendors/index/index.html.erb.deface
 - app/overrides/spree/admin/webhooks_subscribers/_form/api_key.html.erb.deface
@@ -2088,6 +2093,7 @@ files:
 - app/serializables/spree_cm_commissioner/pie_chart_event_aggregator.rb
 - app/serializers/.gitkeep
 - app/serializers/concerns/spree_cm_commissioner/api/v2/resource_serializer_concern_decorator.rb
+- app/serializers/spree/api/v2/base_serializer_decorator.rb
 - app/serializers/spree/api/v2/platform/create_date_specific_item_adjustment_serializer.rb
 - app/serializers/spree/api/v2/platform/create_guest_adjustment_serializer.rb
 - app/serializers/spree/api/v2/platform/create_line_item_adjustment_serializer.rb
@@ -2314,7 +2320,9 @@ files:
 - app/services/spree_cm_commissioner/agency_users/create.rb
 - app/services/spree_cm_commissioner/agency_users/destroy.rb
 - app/services/spree_cm_commissioner/api_caches/invalidate.rb
+- app/services/spree_cm_commissioner/api_caches/invalidate_all.rb
 - app/services/spree_cm_commissioner/assign_product_to_section/update.rb
+- app/services/spree_cm_commissioner/audit_events/cleanup_expired.rb
 - app/services/spree_cm_commissioner/audit_logger.rb
 - app/services/spree_cm_commissioner/calculate_distance.rb
 - app/services/spree_cm_commissioner/cart/add_guest.rb
@@ -2361,6 +2369,7 @@ files:
 - app/services/spree_cm_commissioner/google_wallets/hotel_class_creator.rb
 - app/services/spree_cm_commissioner/google_wallets/hotel_class_updater.rb
 - app/services/spree_cm_commissioner/google_wallets/hotel_object_builder.rb
+- app/services/spree_cm_commissioner/guests/build_dynamic_field_attributes.rb
 - app/services/spree_cm_commissioner/guests/claim_invite_guest_service.rb
 - app/services/spree_cm_commissioner/guests/create.rb
 - app/services/spree_cm_commissioner/guests/finalize.rb
@@ -2638,6 +2647,7 @@ files:
 - app/services/spree_cm_commissioner/routes/create.rb
 - app/services/spree_cm_commissioner/routes/update.rb
 - app/services/spree_cm_commissioner/rsa_service.rb
+- app/services/spree_cm_commissioner/seat_layouts/grid.rb
 - app/services/spree_cm_commissioner/seat_layouts/sanitize_svg.rb
 - app/services/spree_cm_commissioner/seat_layouts/update.rb
 - app/services/spree_cm_commissioner/seats/apply_locks.rb
@@ -2807,6 +2817,7 @@ files:
 - app/views/spree/admin/guest_qr_codes/_guest_qr_codes_print_template.html.erb
 - app/views/spree/admin/guest_qr_codes/index.html.erb
 - app/views/spree/admin/guests/_check_in_status.html.erb
+- app/views/spree/admin/guests/_dynamic_fields.html.erb
 - app/views/spree/admin/guests/_form.html.erb
 - app/views/spree/admin/guests/_table.html.erb
 - app/views/spree/admin/guests/edit.html.erb
@@ -2967,6 +2978,7 @@ files:
 - app/views/spree/admin/service_fee_rules/edit.html.erb
 - app/views/spree/admin/service_fee_rules/index.html.erb
 - app/views/spree/admin/service_fee_rules/new.html.erb
+- app/views/spree/admin/shared/_api_cache_button.html.erb
 - app/views/spree/admin/shared/_availability_percentage.html.erb
 - app/views/spree/admin/shared/_cms_pages_tabs.html.erb
 - app/views/spree/admin/shared/_customer_notification_tabs.html.erb