Commit Graph

  • 11f3bbc566 Remove leftover recording Maikel Linke 2024-10-03 13:28:17 +10:00
  • e5ee398f26 Re-use default stock location in specs Maikel Linke 2024-10-02 16:53:58 +10:00
  • 99c098f567 Ignore StockLocation#active, it's always active Maikel Linke 2024-10-02 16:31:19 +10:00
  • 4b1d7d8a41 Remove dead permission to access StockLocation Maikel Linke 2024-10-02 16:18:38 +10:00
  • 1e3c18f3f6 Remove unneeded method StockLocation#propagate_variant Maikel Linke 2024-10-02 16:12:27 +10:00
  • 22428fc78d ConnectedApps controller, handle ConnectedApps::Vine Gaetan Craig-Riou 2024-10-02 15:40:27 +10:00
  • f980cb45f6 Add logic for ConnectedApps::Vine#connect and disconnect Gaetan Craig-Riou 2024-10-02 11:00:42 +10:00
  • 097c6dee2f Add VineApiService and specs Gaetan Craig-Riou 2024-10-02 10:42:11 +10:00
  • 63a1b390e2 Merge pull request #12885 from mkllnk/stock-cleanup Gaetan Craig-Riou 2024-10-02 16:24:08 +10:00
  • 1a30cf6495 Hide VINE token Gaetan Craig-Riou 2024-10-01 13:58:32 +10:00
  • f7708d69a7 Add VineJwtService Gaetan Craig-Riou 2024-10-01 15:58:09 +10:00
  • 6eb5986c68 Merge pull request #12884 from mkllnk/oc-index Gaetan Craig-Riou 2024-10-02 16:01:50 +10:00
  • 4d9f396f40 Ignore unused column spree_stock_locations.backorderable_default Maikel Linke 2024-10-02 15:16:05 +10:00
  • ac3730096f Update specs to assume backorderable default Maikel Linke 2024-10-02 15:13:00 +10:00
  • 662467a1a4 Use database default value for stock_items.backorderable Maikel Linke 2024-10-02 15:09:44 +10:00
  • af07358914 Assume on-demand is false by default Maikel Linke 2024-10-02 15:05:20 +10:00
  • 8e7e5fc20f Add database index to order cycle dates Maikel Linke 2024-10-02 12:05:13 +10:00
  • aa5feb6605 Remove system spec Gaetan Craig-Riou 2024-10-02 09:33:02 +10:00
  • 3c613f80a3 Merge pull request #12875 from macanudo527/docker/upgrade_to_dockerv2 Maikel 2024-10-02 08:53:24 +10:00
  • 83b6f58100 Merge pull request #12881 from mkllnk/card-payment-spec Gaetan Craig-Riou 2024-10-01 13:30:49 +10:00
  • 17c32ae09a Spec change more clearly Maikel Linke 2024-10-01 13:16:16 +10:00
  • 0474c591de Fix date-dependent spec Maikel Linke 2024-10-01 13:14:09 +10:00
  • 196956140e Merge pull request #12856 from mkllnk/dfc-order Maikel 2024-10-01 10:51:00 +10:00
  • b2b6847882 Fix test data Gaetan Craig-Riou 2024-10-01 10:38:33 +10:00
  • d01d312b4f Fix updating pending payment Gaetan Craig-Riou 2024-10-01 10:22:47 +10:00
  • a74cf97083 Fix spec when adding a product with transaction fee Gaetan Craig-Riou 2024-09-30 16:49:19 +10:00
  • 03dbd54b25 Fix order updater to update payment fees Gaetan Craig-Riou 2024-09-30 16:15:59 +10:00
  • fafd86a2db Revert change made in https://github.com/openfoodfoundation/openfoodnetwork/pull/12538 Gaetan Craig-Riou 2024-09-30 16:04:44 +10:00
  • 91f2ca9286 Merge pull request #12734 from cillian/replace-text-angular-with-trix Gaetan Craig-Riou 2024-09-30 09:40:48 +10:00
  • 3015beab99 Update all locales with the latest Transifex translations v4.6.7 filipefurtad0 2024-09-27 18:02:50 -06:00
  • da0660c119 Merge pull request #12857 from chahmedejaz/task/12626-add-clone-failure-explaination Filipe 2024-09-27 17:58:31 -06:00
  • 852dd41f89 Merge pull request #12836 from wandji20/wb-OFN-11600 Filipe 2024-09-27 17:41:04 -06:00
  • 48993232d1 Merge pull request #12833 from dacook/page-titles Filipe 2024-09-27 16:59:43 -06:00
  • 0002b2e019 Clean up hardcoded values and improve readability wandji20 2024-09-03 14:59:06 +01:00
  • 84a2e6c24d Add browser unsaved changes modal when navigation form order sumary page [OFN-11600] wandji20 2024-09-02 21:15:49 +01:00
  • be4e0a259e Specify alternate html_title David Cook 2024-09-02 10:53:48 +10:00
  • c362e8dd0d Use page titles in HTML head David Cook 2024-09-02 10:52:41 +10:00
  • 1550ca5da0 fix the choice drag issue - disabled width on select2-search-choice-close so that it doesn't cover whole option Ahmed Ejaz 2024-09-27 16:57:35 +05:00
  • f474afaceb Merge in latest :master and resolve conflict in app/models/enterprise.rb Cillian O'Ruanaidh 2024-09-27 10:11:26 +01:00
  • 8c71760556 Merge pull request #12784 from wandji20/wb-OFN-12774 Sigmund Petersen 2024-09-27 10:42:54 +02:00
  • 37ab832b86 Remove window unload event listener from edit order cycle cancel link wandji20 2024-09-01 22:10:04 +01:00
  • a11873559b Make OC edit warning modal cancel button redirect user to OC list [OFN-12774] wandji20 2024-08-16 14:11:55 +01:00
  • 51b3770188 Keep failed backorder job in dead set Maikel Linke 2024-09-26 13:33:30 +10:00
  • 989a6d57e0 Notify user of failed backorder completion Maikel Linke 2024-09-26 10:37:23 +10:00
  • 495634b60c Send error notification to owner Maikel Linke 2024-09-25 16:26:59 +10:00
  • 49fd1dc4a6 Report backorder errors instead of failing checkout Maikel Linke 2024-09-25 15:31:54 +10:00
  • e31e45b875 Place backorders in the background Maikel Linke 2024-09-25 14:31:06 +10:00
  • 61fec653cf Abstract OrderLocker for re-use Maikel Linke 2024-09-25 14:07:55 +10:00
  • eece738865 Restore concurrency spec for the checkout Maikel Linke 2024-09-25 11:23:55 +10:00
  • 2465780c1c Import prices and stock levels from DFC catalog Maikel Linke 2024-09-26 08:53:08 +10:00
  • 21b7e6e567 Use Dockerv2 Neal Chambers 2024-09-24 09:30:28 +09:00
  • eb8050d61d Add spec reproducing the bug Gaetan Craig-Riou 2024-09-25 15:58:28 +10:00
  • 9f43244312 Import on-demand stock setting in DFC import Maikel Linke 2024-09-19 17:06:47 +10:00
  • 66f080232f Import DFC product images Maikel Linke 2024-09-17 15:17:55 +10:00
  • 7f62b49da5 Move catalog loading to where it's needed Maikel Linke 2024-09-17 11:56:55 +10:00
  • 070b93c531 Fall back to givin product id w/o retail variant Maikel Linke 2024-09-17 11:35:22 +10:00
  • fb96f8f936 Fall back to given product w/o wholesale variant Maikel Linke 2024-09-16 15:48:03 +10:00
  • 4303f0e974 Build API URLs to work with any FDC Shopify shop Maikel Linke 2024-09-13 15:52:40 +10:00
  • 2eec4c73bf Apply 4 hour completion delay only to one enterprise Maikel Linke 2024-09-13 14:53:20 +10:00
  • 5ef85aef3e Handle backorder cancellations Maikel Linke 2024-09-13 13:50:53 +10:00
  • 283db8f9d0 Adjust quantities of backorder before completion Maikel Linke 2024-09-12 15:53:22 +10:00
  • 95e620a78b Add lookup of variants by semantic id Maikel Linke 2024-09-12 11:05:36 +10:00
  • c948efd9ce Add structure to adjust final quantities Maikel Linke 2024-09-11 16:20:05 +10:00
  • 95bc0cc679 Reduce complexity of BackorderJob Maikel Linke 2024-09-11 13:30:02 +10:00
  • efe2b724e6 Find wholesale offer for retail variant Maikel Linke 2024-09-10 17:09:12 +10:00
  • 14c32c0d2e Reduce complexity Maikel Linke 2024-09-10 16:20:15 +10:00
  • 8f4f873ba0 Move offer finding into separate class Maikel Linke 2024-09-10 16:17:42 +10:00
  • c0ae2ede2c Complete order 4 hours after order cycle closed Maikel Linke 2024-09-06 16:35:59 +10:00
  • 3ec53a7d71 Parse updated order result Maikel Linke 2024-09-06 16:08:58 +10:00
  • 3849db7c48 Simplify order update call Maikel Linke 2024-09-06 16:06:19 +10:00
  • 7b286ea31d Complete test for FDC Orders API Maikel Linke 2024-09-06 15:33:44 +10:00
  • 3e0eb8708e Simplify service with ivar Maikel Linke 2024-09-06 13:38:22 +10:00
  • c7fa3ff819 Simplify order update logic Maikel Linke 2024-09-06 13:26:48 +10:00
  • f839452df9 Complete an open order Maikel Linke 2024-09-06 12:46:58 +10:00
  • a7a38890f4 Add needed quantities to existing line items Maikel Linke 2024-09-04 16:12:37 +10:00
  • caa6d284f0 Find and update existing open order Maikel Linke 2024-08-30 17:03:55 +10:00
  • 827e37cada Start moving backorder logic to service Maikel Linke 2024-08-23 16:56:10 +10:00
  • 6c6927af84 Add SaleSession with correct OrderCycle times Maikel Linke 2024-08-23 15:45:11 +10:00
  • 439f0cac64 Raise errors on DFC requests Maikel Linke 2024-08-23 14:42:28 +10:00
  • 98966f6b89 Place backorders for DFC products Maikel Linke 2024-03-26 16:46:20 +11:00
  • 260e4f7b00 Create BackorderJob to place wholesale orders Maikel Linke 2024-03-20 16:35:19 +11:00
  • 0824430da5 Add Vine connected app Gaetan Craig-Riou 2024-09-24 10:43:55 +10:00
  • 099da3fc6c Merge pull request #12872 from mkllnk/enterprise-serialiser Gaetan Craig-Riou 2024-09-23 10:14:44 +10:00
  • 7078c4ef03 Merge pull request #12871 from openfoodfoundation/dependabot/npm_and_yarn/body-parser-1.20.3 Gaetan Craig-Riou 2024-09-23 10:09:49 +10:00
  • 318790d207 Remove unused join table Maikel Linke 2024-09-20 16:44:25 +10:00
  • 2be8ef96be Remove unreachable code Maikel Linke 2024-09-20 16:35:41 +10:00
  • f6e4b107b0 Update all locales with the latest Transifex translations v4.6.6 Maikel Linke 2024-09-20 09:46:02 +10:00
  • a5d17b4da9 Merge pull request #12459 from mkllnk/description-html Filipe 2024-09-19 16:12:45 -06:00
  • 83ab9594f6 Merge pull request #12854 from chahmedejaz/task/11200-conditionally-hide-producer-column Filipe 2024-09-19 15:42:15 -06:00
  • 562a24524b Merge pull request #12848 from rioug/12770-product-preview Filipe 2024-09-19 15:20:18 -06:00
  • 2809194b42 Merge pull request #12847 from dacook/fix-bug-12835 Filipe 2024-09-19 14:31:04 -06:00
  • 7d3eff2abb Merge pull request #12845 from wandji20/wb-OFN-12281 Maikel 2024-09-19 11:22:30 +10:00
  • c0a49df150 Bump body-parser from 1.20.2 to 1.20.3 dependabot[bot] 2024-09-18 23:20:33 +00:00
  • f8bb33a9e8 Merge pull request #12869 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-8.0.10 David Cook 2024-09-19 09:19:24 +10:00
  • 24a25d31a0 Bump @hotwired/turbo from 8.0.6 to 8.0.10 dependabot[bot] 2024-09-18 09:50:44 +00:00
  • 4822a9ebcd Merge pull request #12868 from rioug/fix-buu-permission David Cook 2024-09-18 17:25:24 +10:00
  • 68fa903d61 Add missing permission check on buu action Gaetan Craig-Riou 2024-09-18 10:24:09 +10:00
  • c2e0c94f2e Remove unused debounced plugin wandji20 2024-09-17 11:56:07 +01:00
  • 296997d558 Test to ensure report abilities David Cook 2024-09-17 13:23:14 +10:00
  • a9ad6a2851 Grant product managers ability to create reports David Cook 2024-09-17 11:15:21 +10:00