raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,241 Commits 18 Branches 452 Tags
db3637fe84d2e4bf5743df1dfd892eff7d626cce
Commit Graph

7241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lynne Davis
a1ebd18b7c Updating en-GB file to reflect recent additions 2016-04-15 10:55:31 +01:00
Steve Pettitt
0b820361de Merge master 2016-04-15 08:29:52 +01:00
Steve Pettitt
fc719230a3 Add failed payments, update spec 2016-04-15 08:26:12 +01:00
Maikel Linke
49febc6333 Store customer email as lower case 2016-04-15 15:35:43 +10:00
Maikel Linke
48f1794d70 Allow admin user to create customers 2016-04-15 14:34:29 +10:00
Maikel Linke
e17b609517 Apply code standards 2016-04-15 14:31:54 +10:00
Maikel Linke
a25f4fdf44 Associate new users with existing customer records 2016-04-15 11:57:18 +10:00
Maikel Linke
831df0b222 Create and delete customers in admin interface 
Removed Customers service and extended CustomerResource.
 2016-04-15 11:12:22 +10:00
Maikel Linke
ecd32819a6 Remove unused matcher 2016-04-15 11:12:22 +10:00
Maikel Linke
9e4610f9bd Customers: enable change of hub if no customers 
Fix #588.

And show search bar even when no customers are shown. Previously, the
search bar disappeared when you entered a search without results.
 2016-04-15 11:12:22 +10:00
Maikel Linke
df5b554f24 Merge branch 'issue-878' of https://github.com/elf-pavlik/openfoodnetwork into locale-patches 2016-04-15 09:49:14 +10:00
Maikel Linke
ef0d6bd4d6 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into state_translation_override 
Conflicts:
	spec/lib/open_food_network/order_cycle_management_report_spec.rb
 2016-04-15 08:27:09 +10:00
elf Pavlik
f15e948085 small i18n fixes #878 2016-04-14 16:10:21 -05:00
Rohan Mitchell
53e6d391e3 Fix intermittent fail on insignificant result ordering 2016-04-14 09:40:55 +10:00
Maikel Linke
a2c58c7ca1 Match array without order in ocm spec 
That spec was randomly failing.
 2016-04-13 16:59:54 +10:00
Maikel Linke
0ac87b9e55 Override spree_i18n payment_state, shipment_state 2016-04-13 16:50:01 +10:00
Rohan Mitchell
59b564c4be Report job queue status via API 2016-04-13 16:48:24 +10:00
Rohan Mitchell
193580d5d9 Enqueue jobs directly via SQL rather than loading full Rails stack 2016-04-13 16:48:24 +10:00
Rohan Mitchell
eb846e27fd Run a job queue heartbeat every 5 minutes 2016-04-13 16:48:24 +10:00
Maikel Linke
e3ed831e30 Merge branch 'state_translation_override' of https://github.com/stveep/openfoodnetwork into state_translation_override 2016-04-13 16:42:28 +10:00
Maikel Linke
e6b1d545a3 Merge branch 'default-logos' of https://github.com/bingxie/openfoodnetwork into default-logos 2016-04-13 15:12:01 +10:00
Steve Pettitt
b79b0d7586 Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into uk/state_translation_override 2016-04-11 22:31:56 +01:00
Steve Pettitt
39e3374ece Add comment 2016-04-11 22:27:47 +01:00
Steve Pettitt
1483023769 Add a sweet warning sign 2016-04-10 22:48:38 +01:00
Steve Pettitt
bc048a943c Show all payments, format unsuccessful payments grey, add 'invalid' translation. 2016-04-10 22:23:39 +01:00
Steve Pettitt
4414a3f287 Fix spelling mistake 2016-04-09 10:05:45 +01:00
Steve Pettitt
27fdfb60af Override incorrect Spree GB translations for state/county 2016-04-09 09:41:21 +01:00
Bing Xie
852dce2dff Add default logos and home_hero 2016-04-08 14:41:44 +10:00
Maikel Linke
b050f27a84 Default logos for new installations 2016-04-06 16:10:32 +10:00
Rob Harrington
44077a2c6f Fixing styling (bottom margin for save-bar) on inventory page 2016-04-06 15:43:55 +10:00
Rob Harrington
0ed97d820c Removing unrequired Spree::Order#with_payment_method_name scope v1.6.0 2016-04-02 01:04:09 +11:00
Rob Harrington
9b5bfdeb00 Allowing Order Management Report to filter by multiple payment / shipping methods at once 
Also switched to using id rather than name to filter
 2016-04-02 01:04:09 +11:00
Lynne Davis
f8e3f29d1a More bug fixes. Spec updated to reflect changes 2016-04-02 01:04:09 +11:00
Lynne Davis
d844dc8e1b Bug fixes to Order Cycle Reports 2016-04-02 01:04:09 +11:00
Rob Harrington
6c5aaef86e Removing ability to create order discount rules 
Issue with application of tax to discounted items is yet to be resolved
 2016-04-01 21:31:36 +11:00
Rob Harrington
d8c17d160a Applying shipping method rules in checkout 2016-04-01 19:48:25 +11:00
Rob Harrington
c099711f97 Removing dialogOptions library, not required anymore 2016-04-01 19:48:25 +11:00
Rob Harrington
d278b72289 Updating Tag Rules UI to allow management of new FilterShippingMethods rule type 2016-04-01 19:48:25 +11:00
Rob Harrington
82bc26fe90 Splitting tag rule feature specs out into their own spec file 2016-04-01 19:48:25 +11:00
Rob Harrington
47df106237 Refactor tragsWithTranslation directive to handle dynamic attr names 2016-04-01 19:48:25 +11:00
Rob Harrington
f70b1f4572 Refactoring tag rule model and adding new rule type: FilterShippingMethod 2016-04-01 19:48:25 +11:00
Rob Harrington
ed134bac84 Removing unrequired initSelection option from ofn-select2 2016-04-01 19:48:25 +11:00
Rob Harrington
33aad10e73 Adding dialogOptions library for adding responsiveness to jquery dialog 2016-04-01 19:48:25 +11:00
Rob Harrington
3d78b375c6 Moving angularjs tag rule logic into its own module 2016-04-01 19:48:25 +11:00
Rob Harrington
f9acee2be4 Shipping methods can be tagged 2016-04-01 19:48:25 +11:00
Rob Harrington
86c80124fc Moving tags-with-translation directive to admin.utils 2016-04-01 19:48:25 +11:00
Rob Harrington
443e232ea4 Renaming angular admin.shipping_methods and admin.payment_methods modules 2016-04-01 19:48:25 +11:00
Rob Harrington
c74c274a9e Renaming shippingMethodCtrl to shippingMethodsCtrl 2016-04-01 19:48:25 +11:00
Rob Harrington
f902474591 Relevant DiscountOrder tag rules are applied to orders on update 2016-04-01 19:48:25 +11:00
Rob Harrington
bf72864c2b Tag Rules can be deleted 2016-04-01 19:48:25 +11:00