Rohan Mitchell
f5b45fa0ba
Merge branch 'master' into folklabs-producer-emails
2015-05-01 09:51:01 +10:00
summerscope
427f535026
Redesign big chunk of work:
...
> setting up pages for Shops, and shops signup, producers signup
> setting up routes for new pages
> changing fonts to Google Oswald & Roboto
> setting up homepage partials and removing partials no longer required
> changing menu links and labels
2015-04-30 18:20:17 +10:00
summerscope
ae16589717
New version of logo sliced for OFN Australia
2015-04-30 17:55:18 +10:00
Maikel Linke
66f847f673
showing save button at the bottom as well
2015-04-30 17:22:54 +10:00
Maikel Linke
af78859db6
Merge remote-tracking branch 'origin/master' into single-order-patches
2015-04-30 17:18:02 +10:00
Maikel Linke
295da25dd2
insert clone after cloned product
2015-04-30 17:17:28 +10:00
Maikel Linke
5efc0a5110
quick fix: update fees after updating order
2015-04-30 16:29:51 +10:00
Rohan Mitchell
0b652a2113
Add refund icon
2015-04-30 15:49:48 +10:00
Rohan Mitchell
b498c28632
Payments can be refunded
2015-04-30 15:49:48 +10:00
Rohan Mitchell
8184a7c7b2
Pin payments can't void or credit, but they can refund
2015-04-30 15:49:48 +10:00
Rohan Mitchell
a207f50aeb
Merge branch 'master' into delay-devise-emails
...
Conflicts:
script/run_tests.sh
2015-04-30 12:29:06 +10:00
Rohan Mitchell
3565548e91
Extract data preparation into private methods
2015-04-29 15:50:42 +10:00
Rohan Mitchell
6999bcfd4e
Only include complete orders in producer mailer report
2015-04-29 15:43:50 +10:00
Rohan Mitchell
2fe5d7c73f
Remove commented code, use neater syntax for accessing Spree config var
2015-04-29 15:33:39 +10:00
Rohan Mitchell
4279742de5
Avoid serialising entire order cycle when enqueuing OrderCycleNotificationJob
2015-04-29 15:21:05 +10:00
Rohan Mitchell
6b1c125b03
Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails
...
Conflicts:
Gemfile.lock
app/controllers/admin/order_cycles_controller.rb
app/views/admin/order_cycles/edit.html.haml
app/views/admin/order_cycles/show.rep
db/schema.rb
spec/controllers/admin/order_cycles_controller_spec.rb
2015-04-29 14:42:17 +10:00
Maikel Linke
ecf635e080
handle missing bill_address on admin order page
2015-04-29 14:32:13 +10:00
Maikel Linke
2e66a082eb
add customer notes to admin order index page
2015-04-29 14:31:59 +10:00
Rob Harrington
992fb2347d
Merging master branch into require_standard_variant
2015-04-29 14:30:49 +10:00
Maikel Linke
f6d87eee87
Merge remote-tracking branch 'origin/master' into single-order-patches
2015-04-29 13:20:44 +10:00
Maikel Linke
e82a3a9d82
add ship button to admin order index page
2015-04-29 12:30:05 +10:00
Maikel Linke
8511bd19ce
add ship button to order edit page
2015-04-29 12:03:49 +10:00
Maikel Linke
1268108877
handle ship event on order
2015-04-29 12:03:11 +10:00
Maikel Linke
2b0f867ed8
new order method ready_to_ship?
2015-04-29 11:42:35 +10:00
Lynne Davis
9e61a7d083
Adding report type drop down to order_cycle_management_report
2015-04-26 11:03:32 +01:00
Lynne Davis
6bbd3f7c13
Added auth for order_cycle_management_report. This report was breaking supplier enterprises reports due to incorrect authorization.
2015-04-26 11:02:06 +01:00
Rob Harrington
6a4de7c7e2
Hiding filters on list views because styling is broken
2015-04-24 19:35:18 +10:00
Rob Harrington
b1b1bfd8f6
Resolve conflict for overflow dropdown between multiple single-line-selectors on the one page
2015-04-24 16:05:39 +10:00
Maikel Linke
f94a5a975a
Edit Order: resend button uses new pretty template.
2015-04-24 15:31:45 +10:00
Maikel Linke
355221a273
Adding customer name to order edit page heading
2015-04-24 12:33:25 +10:00
Rob Harrington
ed7b763ecf
UnitsCtrl can interpret unit_value_with_description without a separating space
2015-04-24 12:15:35 +10:00
Rob Harrington
05c350b5ff
Refactoring unitsCtrl
2015-04-24 11:27:47 +10:00
Rob Harrington
6cde1f7732
Add tooltip with value for selectors
2015-04-23 14:11:50 +10:00
Rob Harrington
7b83438b5e
Pulling property values into the shopfront
2015-04-23 13:51:49 +10:00
Rob Harrington
e6a98747b4
correction in read only logic for filter selectors
2015-04-23 13:32:56 +10:00
Rob Harrington
ed15b95de0
Adding properties and taxons to producer modal
2015-04-23 12:31:20 +10:00
Rob Harrington
3df2720b31
Making filter selectors more flexible, allowing no active-selectors to be passed in, ie. read-only
2015-04-23 12:31:06 +10:00
Maikel Linke
a937fd3c61
Using variant overrides in variant seach on order edit page
2015-04-23 11:37:10 +10:00
Maikel Linke
3412bc25bf
Edit Orders: more variant info in variant search
...
Displaying variant's full name and the producer's name.
2015-04-23 10:17:01 +10:00
Maikel Linke
f1a8011e13
Documentation of Variant.full_name
...
The code was confusing for all developers here. Maybe a bit of doco
helps.
2015-04-23 10:02:32 +10:00
Rob Harrington
0251d8962d
Adding sku to BPE
2015-04-22 21:02:07 +10:00
Rob Harrington
1c617994fc
User can toggle property inheritence from product property page, and checking the box shows a list of producer properties that will be inherited from
2015-04-22 21:02:07 +10:00
Rob Harrington
4a4b3da551
Using properties_including_inherited for product properties on the shop page
2015-04-22 21:02:07 +10:00
Rob Harrington
e546388784
Rename properties_h to properties_including_inherited
2015-04-22 21:02:07 +10:00
Rob Harrington
976c24cf4c
properties_h uses inherit_properties flag, and returns property id rather than presentation
2015-04-22 21:02:07 +10:00
Rob Harrington
f610a709e1
Adding inherits_properties to BPE
2015-04-22 21:02:06 +10:00
Rob Harrington
5d6f265c0a
Moving spree namespaced serializers into admin
2015-04-22 21:02:06 +10:00
Rob Harrington
a4a41ae26a
Refactor properties_h
2015-04-22 21:02:06 +10:00
Rohan Mitchell
700cb73b8f
Send enterprise confirmation emails asynchronously
2015-04-21 16:19:02 +10:00
Rohan Mitchell
9d225142c8
Send password reset instructions asynchronously
2015-04-21 16:10:40 +10:00
