raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,201 Commits 18 Branches 452 Tags
f40bd9cfcb7918366f71e9215f3b4c8b68445c8d
Commit Graph

9201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugo Daniel
f40bd9cfcb Fixing wrong incrementation 2018-04-04 14:58:47 +10:00
Hugo Daniel
843bca9ea3 Updated calculation for flexible rate 2018-04-04 14:58:46 +10:00
Maikel Linke
80da0d5330 Set enterprise form dirty on any change 
Commit 4953c69123 introduced a bug that
the save button is not activated when changing enterprise fields.
https://github.com/openfoodfoundation/openfoodnetwork/issues/2195

This is reverting the change and fixes #2195.
Sadly, it re-opens
https://github.com/openfoodfoundation/openfoodnetwork/issues/1216.
But that one is not as severe as the current bug.
 2018-04-04 13:36:03 +10:00
Hugo Daniel
5ec89dde42 Update test sentences to fit new PriceSack behavior 2018-04-04 11:25:26 +10:00
Hugo Daniel
213456f4d9 Moved PriceSack tests from per item list to per order 2018-04-04 11:25:26 +10:00
Hugo Daniel
14ea591c7d Removed redundant self 2018-04-04 11:25:25 +10:00
Hugo Daniel
28009afbea Calculate price sack fees and tests 2018-04-04 11:25:25 +10:00
Matt-Yorkley
357ff5fb7d Improve associating customer specs 2018-04-04 10:14:55 +10:00
Matt-Yorkley
5f2e72e3d4 Private shop spec 2018-04-04 10:14:55 +10:00
Em-AK
3b5c3f41a2 Ensure created users are associated with customers 
When a user is created with the same email as existing customers
Then the user is associated with these customers

So that the user can access the private shops where he has been invited
to before signup
 2018-04-04 10:14:55 +10:00
Rob Harrington
a83bdf16c9 Add error message for case when schedule cannot be deleted 2018-04-04 09:21:52 +10:00
Maikel
f9dbf61afc Merge pull request #2176 from HugsDaniel/2002_calculator_options_not_translated 
Overwrites spree_i18n translations for calculator's options
 2018-04-04 08:17:18 +10:00
Pau Pérez Fabregat
15bd0de971 Merge pull request #2194 from wrycoder/spec-deprecation-fix 
Replacing deprecated #ignore with #transient
 2018-04-03 18:53:04 +02:00
Pau Pérez Fabregat
87329ad729 Merge pull request #2092 from ltrls/fix-tax-admin-order-show 
Fix incorrect tax on Admin Order Show
 2018-04-03 08:36:10 +02:00
Hugo Daniel
6731dd0b64 Overwrites spree_i18n translations for entreprise fees calculator's options 2018-04-03 08:38:00 +10:00
Michael Toulouse
0519269a53 Replacing deprecated #ignore with #transient 2018-04-02 06:40:12 -04:00
Pau Pérez Fabregat
1357c7c3b5 Merge pull request #2185 from coopdevs/remove-in-stock-dead-scope 
Remove in_stock dead scope
 2018-03-28 13:16:02 +02:00
Pau Perez
0cbd967007 Remove in_stock dead scope 
This makes the upgrade to Spree 2.0 a bit easier.
`spree_variants.count_on_hand` is removed in that version and this
column was used in the `in_stock` scope that we no longer use.
 2018-03-28 12:13:34 +02:00
Pau Pérez Fabregat
7fbaff71c7 Merge pull request #2179 from coopdevs/ignore-vendor-bundle 
Ignore Bundler's vendor/bundle
 2018-03-28 11:29:56 +02:00
Pau Pérez Fabregat
9f6b3498bd Merge pull request #2177 from coopdevs/upgrade-delayed-job 
Upgrade delayed_job_active_record from 4.0.2 to 4.1.2
v1.13 		2018-03-27 17:45:33 +02:00
Pau Pérez Fabregat
0b9881b9d3 Merge pull request #2168 from openfoodfoundation/transifex 
Update translations with current Transifex version
 2018-03-27 17:16:10 +02:00
Transifex-Openfoodnetwork
348364814d Updating translations for config/locales/es.yml 2018-03-28 02:11:09 +11:00
Pau Perez
e8d8d5b0e6 Ignore Bundler's vendor/bundle 2018-03-27 16:56:58 +02:00
Pau Pérez Fabregat
dbf647f700 Merge pull request #1981 from Duende13/su_issue_1936 
Added 'meta_keywords' to search of products
 2018-03-27 14:27:40 +02:00
Hugo Daniel
ef2b0b8383 Added tooltips and locale 2018-03-27 15:21:12 +11:00
duende13
f75b865be8 Made changes requested by reviewer, in labels and tests. 2018-03-27 15:21:11 +11:00
duende13
7670d01c6d Changing SEO tab to 'Search' tab 2018-03-27 15:21:11 +11:00
duende13
61300a62c2 Added 'meta_keywords' to search of products in shop page. Changed labels 
on SEO tab and SEO form (edit product Screen) and added in en.yml file.
 2018-03-27 15:21:11 +11:00
Transifex-Openfoodnetwork
a3fa6db5a9 Updating translations for config/locales/de_DE.yml 2018-03-26 21:38:21 +11:00
Pau Perez
dae883c68d Upgrade dj_active_record from 4.0.2 to 4.1.2 
This brings few styling improvements on dlayed_job_active_record but
also upgrades delayed_job from 4.0.4 to 4.1.4, which includes some fixes
and improved error messages.
 2018-03-26 12:32:25 +02:00
Pau Pérez Fabregat
808f7b12c7 Merge pull request #2175 from coopdevs/upgrade-skylight 
Upgrade Skylight from 1.5.1 to 1.6.0
 2018-03-26 12:12:46 +02:00
Pau Perez
82c9cdd874 Upgrade Skylight from 1.5.1 to 1.6.0 2018-03-26 11:13:29 +02:00
Transifex-Openfoodnetwork
a257febc79 Updating translations for config/locales/fr.yml 2018-03-26 20:06:24 +11:00
Pau Pérez Fabregat
17b129ff4f Merge pull request #2079 from mjal/424cart-page-shouldnt-show-admin-handling-if-it-is-zero 
Cart page shouldnt show admin handling if it is zero
 2018-03-23 18:01:09 +01:00
Pau Pérez Fabregat
6ce552727b Merge pull request #2118 from oeoeaio/payment-summary-for-emails 
Show payment summary in confirmation email regardless of payment method
 2018-03-23 15:30:44 +01:00
Pau Pérez Fabregat
dadc02fb11 Merge pull request #2030 from lin-d-hop/uk/1663variant-order-emails 
Uk/1663variant order emails
 2018-03-23 15:29:05 +01:00
Pau Pérez Fabregat
bbd2427493 Merge pull request #2075 from mjal/2001translations-missing-in-order-management-pages 
i18n for admin/orders
 2018-03-23 15:27:55 +01:00
Pau Pérez Fabregat
82457d2b63 Merge pull request #2138 from Matt-Yorkley/email/manager_invite 
Email/manager invite
 2018-03-23 15:27:14 +01:00
Pau Pérez Fabregat
9e14186431 Merge pull request #2149 from oeoeaio/subs-remove-fields 
Subs: Remove obsolete subscription fields from order cycles table
 2018-03-23 15:12:32 +01:00
Pau Pérez Fabregat
d422283b76 Merge pull request #2128 from mkllnk/2113-i18n-config 
2113 Display only selected languages in switcher
 2018-03-23 15:06:47 +01:00
Pau Pérez Fabregat
13115d4a2d Merge branch 'master' into email/manager_invite 2018-03-23 12:56:10 +01:00
Pau Pérez Fabregat
1005c299a2 Merge pull request #1464 from Matt-Yorkley/uk/bep_images 
Uk/bep_images
 2018-03-23 12:40:16 +01:00
Pau Pérez Fabregat
3788ec590f Merge pull request #2166 from coopdevs/configure-mails-from 
Configure mails_from
 2018-03-23 12:19:31 +01:00
Pau Pérez Fabregat
7dd23d20c8 Merge pull request #2160 from coopdevs/fix-enterprise-filter-in-customers 
Fix enterprise filter in customers
 2018-03-23 08:25:21 +01:00
stveep
231dd7b6a2 Add some rubocop spaces 2018-03-23 17:37:50 +11:00
stveep
8a783bbb7d PR changes: extract SQL in methods to scopes, add case insensitivity to test for sorting 2018-03-23 17:37:50 +11:00
stveep
9375318c4b Codeclimate: remove empty line 2018-03-23 17:37:50 +11:00
stveep
dc76b3922b Add sorting to query for producer mailer 2018-03-23 17:37:50 +11:00
stveep
40506685ef Adding extra sort step for variant name; ignore case in sorting line items by name 2018-03-23 17:37:50 +11:00
Duende13
f5ad950bc3 Change Syntax from :variant => :product to variant: :product 2018-03-23 17:37:50 +11:00