raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-25 01:23:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,328 Commits 17 Branches 454 Tags
207c6bc205ca7ce9f9cb1699bf7e2c21824bcb93
Commit Graph

10092 Commits

Author SHA1 Message Date
Luis Ramos
ce1114556d Merge pull request #5578 from mbudm/issue/3770-manual-update 
Update orders swagger spec and fix api_key access to orders endpoint
 2020-07-06 20:32:25 +01:00
Luis Ramos
761871c90e Merge pull request #5715 from luisramos0/ship_method 
Fix issue in Spree 2.1 and bring Spree::Stock classes to OFN 🎉
 2020-07-06 19:15:50 +01:00
Luis Ramos
ceac8a5d40 Merge pull request #5725 from Matt-Yorkley/admin-order-images 
Fix default image display in admin order edit
 2020-07-06 14:03:56 +01:00
Luis Ramos
ff9133b7aa Merge pull request #5699 from coopdevs/fix-order-button-radius 
Make button border radius consistent
 2020-07-03 23:01:14 +01:00
Luis Ramos
b917238d1e Merge pull request #5446 from luisramos0/sca_refunds 
Make StripeSCA void action work
 2020-07-03 22:45:35 +01:00
Matt-Yorkley
46c40bdf33 Fix default image display in admin order edit 2020-07-03 22:58:29 +02:00
Luis Ramos
a472b6525f Merge pull request #5707 from luisramos0/missing_spaces 
Add space after translations so that translators dont have to guess a space is needed
 2020-07-03 16:10:55 +01:00
Luis Ramos
07a44cfaf3 Update selected shipping rate if there is an original shipping method to keep and it is different from the one selected through the Estimator process 
Make sure the shipment is saved (callbacks!) whenever the ship method has changed in the refresh_rates process
 2020-07-03 13:48:12 +01:00
Matt-Yorkley
d2db9b3a66 Merge pull request #5599 from luisramos0/submit_on_enteer 
Make Enter submit the form on both products and orders admin
 2020-07-03 11:14:57 +02:00
Luis Ramos
91026e6606 Merge pull request #5601 from jeduardo824/enhancement/5454-links-to-shops-in-new-tabs 
Enhancement/5454 make links to shops under Groups > Producers open in new tab
 2020-07-02 23:51:59 +01:00
Luis Ramos
758bb17142 Fix some easy rubocop issues and add some exceptions to to manual todo list 2020-07-02 21:24:15 +01:00
Luis Ramos
659de3d24d Replay spree commit a4622ee13a723f0dba2943967b445b9989f67fb2 to fix issue introduced in spree 2.1 2020-07-02 21:24:15 +01:00
Luis Ramos
ff046f7a6c Remove conditionals related to Config.track_inventory_levels, this config is always true in OFN 2020-07-02 21:24:14 +01:00
Luis Ramos
ee66e37521 Move adjuster, estimator, packer and prioritizer to order management engine 2020-07-02 21:24:14 +01:00
Luis Ramos
83974a832c Move Coordinator from Spree::Stock to OrderManagement::Stock 2020-07-02 21:24:14 +01:00
Luis Ramos
01b1abbd52 Bring method from Spree::Order so that we can move Coordiantor to the order management engine 2020-07-02 21:24:14 +01:00
Luis Ramos
b487185a65 Remove package factory, it is no longer needed, we can just call the Package class in the two places where it is used 2020-07-02 21:24:14 +01:00
Luis Ramos
f0b3ed0d79 Merge Spree::Stock::Package into OrderManagement::Stock::Package 2020-07-02 21:24:14 +01:00
Luis Ramos
943cb7bf05 Move Stock::Package to OrderManagement::Stock::Package 2020-07-02 21:24:14 +01:00
Luis Ramos
1b28592f58 Now that the stock code is on out side we can clean up! 
Remove everything related to splitters (including bringing environment.rb so we remove the splitters variable from it
 2020-07-02 21:24:14 +01:00
Luis Ramos
8e116dd58a Make ensure_correct_adjustment a public method because we call it in OFN 2020-07-02 21:24:14 +01:00
Luis Ramos
2e33e02d7f Remove dead code, this method was removed in spree 2.0.4 2020-07-02 21:24:14 +01:00
Luis Ramos
7a03f57da0 Merge shipment decorator with class brought from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
494251b7cf Fix simple rubocop issues 2020-07-02 21:24:14 +01:00
Luis Ramos
4e5259f491 Bring shipment from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
bdb40d68e9 Fix easy rubocop issues 2020-07-02 21:24:14 +01:00
Luis Ramos
b7255130b6 Bring Package from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
0ca8b6aab6 Fix easy rubocop issue 2020-07-02 21:24:14 +01:00
Luis Ramos
3e14c9777e Merge decorator with class brought from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
d505fc2131 Bring availability validator from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
feadbb086f Adapt spec to OFN context 2020-07-02 21:24:14 +01:00
Luis Ramos
b16db2f40e Fix easy rubocop issues 2020-07-02 21:24:14 +01:00
Luis Ramos
8c3b8c4db5 Bring estimator from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
69b9cfbad2 Make packer use BasicSplitter by default 2020-07-02 21:24:14 +01:00
Luis Ramos
ccf928df12 Fix simple rubocop issues 2020-07-02 21:24:14 +01:00
Luis Ramos
e0f9894b7a Bring packer from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
ec50a788a6 Fix easy rubocop issues 2020-07-02 21:24:14 +01:00
Luis Ramos
c2ec34ab9f Bring coordinator from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
eb13595fd3 Fix simple rubocop issues 2020-07-02 21:24:14 +01:00
Luis Ramos
3ae2877d4e Bring adjuster and prioritizer from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
d18fec7125 Move Base splitter from main app models to order management engine services 2020-07-02 21:24:14 +01:00
Luis Ramos
735ee1e7ed Fix simple rubocop issues 2020-07-02 21:24:14 +01:00
Luis Ramos
4fce506201 Bring splitter/base from spree 2020-07-02 21:24:14 +01:00
Luis Ramos
658c77f3f5 Merge pull request #5701 from Matt-Yorkley/noimage 
Noimage
 2020-07-02 20:17:04 +01:00
Luis Ramos
510449547f Merge pull request #5644 from coopdevs/manage-font-with-asset-pipeline 
Manage OFN's font through the asset pipeline
 2020-07-02 20:09:08 +01:00
Matt-Yorkley
8fc407a9d5 Extract repeated variant thumbnail code to a shared partial 2020-07-02 18:36:43 +02:00
Matt-Yorkley
eeb6c57f99 Update missing image paths in other order views 2020-07-02 18:36:27 +02:00
Pau Pérez Fabregat
4ced16c206 Merge pull request #5709 from luisramos0/empty 
Replace empty? with blank? and replace unless empty? with if present?
 2020-07-02 11:36:37 +02:00
Luis Ramos
7dcc2bb27c Merge pull request #5703 from Matt-Yorkley/checkout-addresses 
Checkout addresses
 2020-07-01 19:06:29 +01:00
Pau Pérez Fabregat
66ddde1808 Merge pull request #5682 from Matt-Yorkley/in-digest-ion 
Move default versions of Paperclip-managed images to /public
 2020-07-01 18:02:15 +02:00