raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-06 02:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,259 Commits 16 Branches 455 Tags
0befc714ce05182e8129ea85e6b7e1b1bc67c6f0
Commit Graph

9259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
0befc714ce Merge pull request #2358 from coopdevs/revert-current-order-argument 
Spree 2.0: Fix GET "/"
 2018-06-07 10:45:06 +10:00
Pau Perez
daf12d1300 Revert "Refactor Order#current_order argument" 
This reverts commit ae935202be.
 2018-06-05 18:42:41 +02:00
Pau Perez
89c2733f50 Revert "Removing redundant curly braces" 
This reverts commit 03173d4f7b.
 2018-06-05 18:42:31 +02:00
Pau Perez
32069cffe1 Revert "Removing useless spaces" 
This reverts commit d81b6be259.
 2018-06-05 18:42:19 +02:00
Pau Pérez Fabregat
5b89f6a159 Merge pull request #2285 from coopdevs/get-last-spree-fork-changes 
Upgrade spree to point to 1c3dfc7fb
 2018-05-16 08:42:41 +02:00
Pau Pérez Fabregat
6033981ad5 Merge pull request #2283 from coopdevs/remove-outdated-specs 
Remove no longer valid tests
 2018-05-14 13:22:00 +02:00
Pau Perez
6f8317b007 Upgrade spree to point to 1c3dfc7fb 
This will fetch latest changes applied in the fork. It also changes the
Github organization we fetch it from. From now on we'll work there and
not in Coopdevs org.
 2018-05-14 13:05:51 +02:00
Pau Perez
5c260dae51 Remove no longer valid tests 
`#available_to_order?` is gone in Spree 2.0 and our customization on top
of it went away with #2256.
 2018-05-14 12:30:11 +02:00
Pau Pérez Fabregat
1991a7f34d Merge pull request #2256 from coopdevs/add-custom-package 
Add custom package
 2018-05-14 10:44:05 +02:00
Pau Perez
776b5a23f6 Skip methods that distributor can't use in Package 
This ensures that Spree's shipping methods take into account the ones
the order's distributor uses.

This reimplements what `#available_to_order_with_distributor_check?`
used to do and it doesn't work with Spree 2.0.4.
 2018-05-02 13:58:25 +02:00
Pau Perez
6784621c1b Remove invalid spree config 
According to
5ef8dc67df
"Backorders can be configured now as per stock location or stock item".
 2018-04-30 13:53:23 +02:00
Pau Perez
c3132e87d6 Rename and fix simple_product to base_product 
This factory has been merged into the base_product factory. Besides,
products no longer have on_hand attribute.
 2018-04-30 13:49:52 +02:00
Pau Pérez Fabregat
e7b1d933f4 Merge pull request #2253 from coopdevs/apply-spree-2.0-migrations 
Apply spree 2.0 migrations
 2018-04-30 12:51:29 +02:00
Pau Perez
19870eccdc Install and run Spree v2.0.4 migrations 2018-04-27 17:02:28 +02:00
Pau Pérez Fabregat
9840f3bb6b Merge pull request #2252 from coopdevs/use-patched-spree-2.0.4 
Use OFN's Spree fork of 2.0.4 to get fixes
 2018-04-27 16:58:33 +02:00
Pau Perez
97e8adf7a7 Use OFN's Spree fork of 2.0.4 to get fixes 
We encountered the bug that
3fd1535e75
fixes, which is needed to boot the app using Spree 2.0.4.

This stems from
https://github.com/openfoodfoundation/openfoodnetwork/issues/2236#issuecomment-384633612
 2018-04-26 16:35:28 +02:00
Pau Pérez Fabregat
a1645477e0 Merge pull request #2235 from coopdevs/upgrade-to-spree-2.0.4 
Upgrade Spree to 2.0.4 instead of 2.0.13
 2018-04-23 12:14:49 +02:00
Pau Perez
58f3b5a97e Upgrade Spree to 2.0.4 instead of 2.0.13 
Although we don't know how big the fixes introduced between 2.0.4 and
2.0.13 are, jumping from roughly 1.3.99 to 2.0.13 seems too big of
a change to do in one go.

Unless more issues like this one come up that force us to upgrade to
a newer version I believe it's best to be conservative. You'll find an
in-depth explanation in
https://github.com/openfoodfoundation/openfoodnetwork/wiki/Spree-2.0-upgrade#getting-to-version-204-

A previous effort was done to upgrade to v2.0.13 in
https://github.com/openfoodfoundation/openfoodnetwork/pull/2209
 2018-04-18 08:56:03 +02:00
Pau Perez
06ef2a4c63 Remove commented out gem from Gemfile 2018-04-17 16:10:41 +02:00
Hugo Daniel
595a622d5b Removing useless spaces 2018-04-17 16:10:41 +02:00
Hugo Daniel
d9f451b6fe Removing redundant curly braces 2018-04-17 16:10:41 +02:00
Hugo Daniel
abe5d3596c Refactor Order#current_order argument 2018-04-17 16:10:41 +02:00
Hugo Daniel
e6b58c6db4 Remove ssl deprecated configuration 2018-04-17 16:10:40 +02:00
Hugo Daniel
6f3663f1b9 update gemfile to spree 2.0.13 2018-04-17 16:10:40 +02:00
Pau Pérez Fabregat
1abfe2ab8c Merge pull request #2199 from coopdevs/auto-correct-cops 
Auto correct cops
v1.14 		2018-04-16 14:58:28 +02:00
Pau Pérez Fabregat
b1fc15f242 Merge pull request #2223 from openfoodfoundation/transifex 
Transifex
 2018-04-16 13:43:40 +02:00
Pau Pérez Fabregat
fc7dd5d081 Merge pull request #2222 from coopdevs/upgrade-skylight 
Upgrade to latest Skylight from 1.6.0 to 1.6.1
 2018-04-16 11:38:23 +02:00
Pau Perez
2aea612f10 Upgrade to latest Skylight from 1.6.0 to 1.6.1 2018-04-16 10:52:15 +02:00
Pau Perez
147a74f005 Fix Rubocop violations reported by Code Climate 2018-04-16 10:27:44 +02:00
Pau Pérez Fabregat
514ad5d898 Merge pull request #2208 from coopdevs/performance-monitoring-badge 
Add Skylight's performance monitoring badge
 2018-04-13 08:45:30 +02:00
Pau Perez
5822e60a66 Add Skylight's performance monitoring badge 
Adding the badge, which points now to Katuma's performance monitoring
information, is required for Skylight to showcase OFN on their website.
 2018-04-12 09:29:40 +02:00
Transifex-Openfoodnetwork
ce2a7a510f Updating translations for config/locales/en_US.yml 2018-04-11 00:06:55 +10:00
Pau Perez
394fb91dd5 Auto correct Rubocop's Layout/MultilineArrayBraceLayout cop 2018-04-09 18:47:18 +02:00
Pau Perez
1640d5ad0b Auto correct Rubocop's Layout/IndentHeredoc cop 2018-04-09 18:47:18 +02:00
Pau Perez
76fe1c7ee9 Auto correct Rubocop's Layout/IndentAssignment cop 2018-04-09 18:47:18 +02:00
Pau Perez
33ea2c0b07 Auto correct Rubocop's Layout/FirstParameterIndentation cop 2018-04-09 18:47:18 +02:00
Pau Perez
f5a5d735fd Auto correct Rubocop's Layout/EmptyLinesAroundModuleBody cop 2018-04-09 18:47:18 +02:00
Pau Perez
6593dea4f6 Auto correct Rubocop's Layout/EmptyLinesAroundMethodBody cop 2018-04-09 18:47:17 +02:00
Pau Perez
3161fa3801 Auto correct Rubocop's Layout/EmptyLinesAroundExceptionHandlingKeywords cop 2018-04-09 18:47:17 +02:00
Pau Perez
746fcd5802 Auto correct Rubocop's Layout/EmptyLinesAroundAccessModifier cop 2018-04-09 18:47:17 +02:00
Pau Perez
9da33b4e82 Auto correct Rubocop's Layout/EmptyLinesAroundAccessModifier cop 
This also `script/rubocop_autocorrect` to automate the process of fixing
a cop and comitting the changes.
 2018-04-09 18:46:11 +02:00
Pau Perez
e876ef7df1 Auto correct Rubocop's Layout/ClosingParenthesisIndentation cop 2018-04-09 17:22:52 +02:00
Pau Perez
e4c86df7b2 Auto correct Rubocop's Layout/CaseIndentation cop 2018-04-09 17:19:47 +02:00
Transifex-Openfoodnetwork
15945fa1e0 Updating translations for config/locales/fr.yml 2018-04-05 04:48:54 +10:00
Transifex-Openfoodnetwork
ad898848f8 Updating translations for config/locales/pt.yml 2018-04-05 04:29:49 +10:00
Rob Harrington
236ba9328d Order cycles in specs comply with new date validations 2018-04-04 17:18:33 +10:00
Rob Harrington
ce56e667a4 Use union operator instead of concatenate to load order cycle collection 2018-04-04 17:18:33 +10:00
Rob Harrington
b17d8c2fe3 Add validation of open and close dates for order cycles 2018-04-04 17:18:32 +10:00
Rob Harrington
b14f27f956 Return an error if no order_cycle_set params are submitted to #bulk_update action 2018-04-04 17:17:36 +10:00
Rob Harrington
18f7ec992d Refactor loading of OrderCycleSet in OrderCyclesController 
This should result in a significant speed bump in saving order cycles in bulk, because only referenced OCs are loaded into the set, rather than OrderCycle.all
 2018-04-04 17:17:36 +10:00