Commit Graph

  • 9bfac66412 Merge pull request #13012 from chahmedejaz/task/13007-customer-code-in-order-cycle-email Filipe 2024-12-13 10:50:02 -06:00
  • e26a1d4d3d Bump hotkeys-js from 3.13.7 to 3.13.9 dependabot[bot] 2024-12-12 09:51:55 +00:00
  • 8d1d0c27c9 Install rbenv automatically if missing Maikel Linke 2024-12-12 17:15:53 +11:00
  • 13e008e91e Calculate wholesale price for imported retail variants Maikel Linke 2024-12-12 16:08:45 +11:00
  • e47a57fa3c DRY with offer broker we'll need anyway Maikel Linke 2024-12-12 15:48:42 +11:00
  • d5c3e94b24 OfferBroker needs only catalog URL, no other URLs Maikel Linke 2024-12-12 15:45:42 +11:00
  • 9b965f657c Use OIDC account factory Maikel Linke 2024-12-12 15:22:35 +11:00
  • 58c39166e1 Merge pull request #13000 from mkllnk/dfc-amend-order Maikel 2024-12-12 12:47:13 +11:00
  • b6eca58798 13024: fix dfc catalog sync for blank cart Ahmed Ejaz 2024-12-12 04:28:15 +05:00
  • bf41658d32 Fix nil error when amending backorder Maikel Linke 2024-12-11 12:40:35 +11:00
  • 88837b55b9 Amend backorder also when resuming order Maikel Linke 2024-12-06 13:40:02 +11:00
  • 9c0a15f431 Amend backorders on admin update orders Maikel Linke 2024-12-06 13:14:33 +11:00
  • fcbaefb2c8 Update each backorder only once in bulk cancel Maikel Linke 2024-12-06 11:57:18 +11:00
  • 9ca1b48d2e Move backorder amendment out of order callback Maikel Linke 2024-12-06 10:05:37 +11:00
  • e76d6ad3df Spec current order cancellation amending backorder Maikel Linke 2024-12-05 16:57:29 +11:00
  • e1febc6e00 Simplify page actions Maikel Linke 2024-12-05 16:41:36 +11:00
  • 7d27f46d68 Simplify negated expectation Maikel Linke 2024-12-05 16:31:37 +11:00
  • 7d7253cf0e Re-use BackorderUpdater to complete backorder Maikel Linke 2024-11-27 15:04:26 +11:00
  • 4fa4eb1b4e Move backorder update code to re-usable class Maikel Linke 2024-11-27 13:25:28 +11:00
  • d16cd8c84e Amend backorder completely Maikel Linke 2024-11-22 16:54:58 +11:00
  • 9870abfb1c Merge pull request #13025 from openfoodfoundation/dependabot/npm_and_yarn/trix-2.1.10 Gaetan Craig-Riou 2024-12-11 10:08:00 +11:00
  • 8e46c0f897 Apply changes from https://github.com/openfoodfoundation/openfoodnetwork/pull/13016 Gaetan Craig-Riou 2024-12-11 10:04:57 +11:00
  • 3e031ab735 13026: reset variant unit name if unit is not items Ahmed Ejaz 2024-12-11 03:14:11 +05:00
  • 141000f0df Bump trix from 2.1.9 to 2.1.10 dependabot[bot] 2024-12-10 21:47:00 +00:00
  • 7302c2d161 Merge pull request #12990 from openfoodfoundation/dependabot/npm_and_yarn/tom-select-2.4.1 Maikel 2024-12-11 08:45:16 +11:00
  • 4be4c7622b Clean up Haml Maikel Linke 2024-12-10 15:32:09 +11:00
  • 604a47bd96 13007: add specs for text mail Ahmed Ejaz 2024-12-10 05:49:35 +05:00
  • 241a6d8128 13007: fix specs Ahmed Ejaz 2024-12-02 13:24:55 +05:00
  • bb70d21a35 13007: add specs Ahmed Ejaz 2024-12-02 13:08:38 +05:00
  • 626a269cf8 13007: only show business name when all customers have one Ahmed Ejaz 2024-12-02 12:36:25 +05:00
  • 302336ab02 13007: add business name in order cycle report email Ahmed Ejaz 2024-12-02 11:55:49 +05:00
  • ee2a6bf2e6 Update all locales with the latest Transifex translations v5.0.8 filipefurtad0 2024-12-09 16:46:51 -06:00
  • 7ca5927411 Merge pull request #12996 from chahmedejaz/bugfix/12993-fix-order-cycle-report-text-version Filipe 2024-12-09 16:32:46 -06:00
  • 2926a9662c Bump tom-select from 2.3.1 to 2.4.1 dependabot[bot] 2024-12-09 22:27:56 +00:00
  • 118ed915dc Merge pull request #13020 from openfoodfoundation/dependabot/npm_and_yarn/trix-2.1.9 David Cook 2024-12-10 09:23:28 +11:00
  • 6e40e4da60 Merge pull request #13018 from chahmedejaz/task/13008-add-tax-category-in-all-products-report Filipe 2024-12-09 16:21:01 -06:00
  • 693bef1e7a Bump trix from 2.1.8 to 2.1.9 dependabot[bot] 2024-12-09 20:41:14 +00:00
  • 0d4904d9e4 Small change in spec file Manuel Gonçalves 2024-12-09 09:07:22 +00:00
  • 5def2b53e5 Added a spec file in order to test the tax categories helper Manuel Gonçalves 2024-12-08 10:52:14 +00:00
  • 42940f4729 12993: add total tax incl. Ahmed Ejaz 2024-12-08 01:05:21 +05:00
  • f2da3bb11c 12993: html sanitize city and zip Ahmed Ejaz 2024-12-08 01:05:02 +05:00
  • f8003b00db 12993: translate tax incl and qty Ahmed Ejaz 2024-12-08 01:03:38 +05:00
  • 521b72a6c9 Merge pull request #13004 from chahmedejaz/bugfix/12982-unable-to-close-confirmation-modals Filipe 2024-12-07 10:33:56 -06:00
  • aa4552aac4 Merge pull request #13001 from chahmedejaz/bugfix/12973-product-import-never-completes Filipe 2024-12-05 16:34:43 -06:00
  • 93a3130851 12973: add specs Ahmed Ejaz 2024-11-29 04:17:57 +05:00
  • f3a30f94db 12973: fix error rendering on UI - The caught errors do not get rendered to the UI because of incorrect rendering methods Ahmed Ejaz 2024-11-27 12:00:11 +05:00
  • 16cae2dbcc 12973: fix error raised in variant creation - if the sheet doesn't have the units present, then the variant is not saved due to model validation - After that, while assigning on_hand value, error is raised that the variant is not created first - Now this commit makes sure that the variant is created before implementing above logic Ahmed Ejaz 2024-11-27 11:56:49 +05:00
  • cedf040b47 Per review, test on create and update Gaetan Craig-Riou 2024-12-04 22:15:56 +11:00
  • 4a6e4d4c6d Ensure shipment is updated when using update_or_create Gaetan Craig-Riou 2024-10-30 15:53:15 +11:00
  • 4c71ea3866 Merge pull request #12994 from mkllnk/dfc-update-voc Maikel 2024-12-04 12:57:03 +11:00
  • bc970927a5 Merge pull request #13017 from openfoodfoundation/dependabot/npm_and_yarn/jasmine-core-5.5.0 Gaetan Craig-Riou 2024-12-04 09:49:37 +11:00
  • c331d57cdb 13008: add tax category in all products report Ahmed Ejaz 2024-12-04 03:36:42 +05:00
  • 5845fee663 Bump jasmine-core from 5.4.0 to 5.5.0 dependabot[bot] 2024-12-03 09:38:47 +00:00
  • 3199118bae Removed the :selected attribute when the tax category is not required (like original version) Manuel Gonçalves 2024-12-03 08:54:35 +00:00
  • de938f6f10 Merge pull request #12949 from rioug/12859-use-VINE-voucher Maikel 2024-12-03 14:04:44 +11:00
  • 697f430156 Merge pull request #12992 from mkllnk/errors Maikel 2024-12-03 13:29:11 +11:00
  • c41c15b895 Fix missed Alert call with order object Maikel Linke 2024-12-03 13:02:08 +11:00
  • 980f86ce89 Fixed the lint errors Manuel Gonçalves 2024-12-02 21:22:12 +00:00
  • af200ab4a0 12993: fix lint issues Ahmed Ejaz 2024-12-02 18:40:18 +05:00
  • 4c6c1eedb1 12993: use html safe strings wherever required Ahmed Ejaz 2024-12-02 18:23:24 +05:00
  • bbdee7c0f3 12993: add included tax in text report Ahmed Ejaz 2024-12-02 18:03:49 +05:00
  • 11959515b8 12993: update the condition to display details Ahmed Ejaz 2024-11-26 03:48:47 +05:00
  • cb781536b6 Merge pull request #12905 from macanudo527/docker/use_alpine_image David Cook 2024-12-02 09:57:51 +11:00
  • 53d2166579 Make Connected Apps links available in Transifex drummer83 2024-12-01 23:39:44 +01:00
  • d95bb7736a Fixed the logic and moved the code to a helper file Manuel Gonçalves 2024-12-01 20:43:31 +00:00
  • 7d5bb4a6fa Added the :selected option with the default tax category Manuel Gonçalves 2024-12-01 15:13:49 +00:00
  • 5719d0682d Remove duplicate lines, dev leftovers Maikel Linke 2024-11-29 12:23:51 +11:00
  • c4c95d472e Use defined DFC orders states Maikel Linke 2024-11-22 13:57:35 +11:00
  • 3e7f61c4d1 Add new DFC vocabulary Maikel Linke 2024-09-05 16:26:10 +10:00
  • db76cd1659 Merge pull request #13005 from mkllnk/map-spec Maikel 2024-11-29 14:10:57 +11:00
  • e791184468 Remove failing map spec Maikel Linke 2024-11-29 13:21:21 +11:00
  • 23287573f4 Update all locales with the latest Transifex translations v5.0.7 filipefurtad0 2024-11-28 20:21:43 -06:00
  • 925ac2ea6a Merge pull request #12862 from dacook/anonymise-customer-names Maikel 2024-11-29 09:17:19 +11:00
  • 355c9686e3 Merge pull request #12963 from murjax/map-network-check-8230 Filipe 2024-11-28 12:26:22 -06:00
  • 58d174fad9 Merge pull request #12969 from chahmedejaz/task/12919-remove-empty-option-from-unit-scale-dropdown Filipe 2024-11-28 09:31:42 -06:00
  • d90c4f6aed Merge pull request #12995 from chahmedejaz/bugfix/12968-product-import-update Filipe 2024-11-28 08:38:58 -06:00
  • f5b9ca361c Use the voucher adjustment amount for redeeming Gaetan Craig-Riou 2024-11-18 15:09:52 +11:00
  • 16d6e1f935 Remove unused error translation Gaetan Craig-Riou 2024-11-18 11:40:51 +11:00
  • 1e6fbadd8b Fix Vine::VoucherRedeemerService to handle exceptions Gaetan Craig-Riou 2024-11-18 11:39:30 +11:00
  • d102652c03 Fix Vine::VoucherValidatorService to handle exceptions Gaetan Craig-Riou 2024-11-18 11:25:39 +11:00
  • 1b50217242 Re worked the Vine::ApiService to raise exception on error Gaetan Craig-Riou 2024-11-18 11:13:40 +11:00
  • 73819a4638 Fix unique validator for vouche code Gaetan Craig-Riou 2024-11-13 14:01:56 +11:00
  • 9ab2a3ae3d Per review, fix a some minor issues Gaetan Craig-Riou 2024-11-11 16:19:54 +11:00
  • d413a142c9 Update various voucher related file to use the new Vouchers::Vine Gaetan Craig-Riou 2024-11-13 09:55:03 +11:00
  • 48ad7ed8a0 Add voucher used by multiple enterprise and recycle code scenario Gaetan Craig-Riou 2024-11-11 15:03:17 +11:00
  • a2c4c44eea Move Vine voucher to Vouchers::Vine Gaetan Craig-Riou 2024-11-06 14:49:03 +11:00
  • e7ece294cc Better error for VineVoucherValidatorService Gaetan Craig-Riou 2024-11-04 15:45:59 +11:00
  • d7313ffec9 Per review, improve Vine::VoucherValidatorService Gaetan Craig-Riou 2024-11-04 15:42:24 +11:00
  • b42cba8c37 Add vine_voucher factory Gaetan Craig-Riou 2024-11-04 14:47:00 +11:00
  • 7726c7d129 Per review, rename not_vine scope to local Gaetan Craig-Riou 2024-11-04 14:45:21 +11:00
  • d4d995851f Display voucher section if connected to VINE Gaetan Craig-Riou 2024-10-29 13:58:24 +11:00
  • 12cf62c2ff Refactor, add OrderManagement::Order::Updater#update_voucher Gaetan Craig-Riou 2024-10-29 11:31:14 +11:00
  • 0569b30e0d Refactor Vine related services Gaetan Craig-Riou 2024-10-29 10:45:05 +11:00
  • 9f3da1af4f Reddeem VINE voucher when firing "capture_and_complete_order"o Gaetan Craig-Riou 2024-10-28 16:07:35 +11:00
  • afb336d789 Add spec for fire event "capture_and_complete_order" Gaetan Craig-Riou 2024-10-28 15:58:21 +11:00
  • 92c4cb9b7f Redeem VINE voucher when creating a new payment Gaetan Craig-Riou 2024-10-28 14:37:37 +11:00
  • 724d5a2ca0 Add spec for creating a payment from admin page Gaetan Craig-Riou 2024-10-28 14:32:06 +11:00
  • 6251814152 Hide VINE voucher from admin voucher page Gaetan Craig-Riou 2024-10-23 16:17:53 +11:00
  • cf13dc2ff6 Add system spec when completing order with VINE voucher Gaetan Craig-Riou 2024-10-23 14:53:05 +11:00
  • 4906c19c8e Checkout Summary, remove shared example Gaetan Craig-Riou 2024-10-22 15:54:52 +11:00