Pierre de Lacroix
72d264fab9
Make "on demand" columns visible by default
...
on admin "bulk product edit" and "inventory" (variant overrides) tables
2017-09-15 16:09:26 +10:00
Pau Perez
7e5e167215
Create a mail method when inserting seed data
2017-09-08 23:55:50 +10:00
Rohan Mitchell
3135ef6b7f
Reinstate explicit class name Spree::Calculator on calculated_adjustments association
2017-09-08 23:55:48 +10:00
Rohan Mitchell
0446b8d72f
TestingSupport moved out of Core namespace
2017-09-08 23:55:48 +10:00
Rohan Mitchell
858576d870
CalculatedAdjustments requires include first
2017-09-08 23:55:48 +10:00
Rohan Mitchell
38da4c8e12
Adjustments now have state instead of locked/unlocked
2017-09-08 23:55:48 +10:00
Enrico Stano
3a04136705
Merge pull request #1758 from coopdevs/simplify-karma-rake-task
...
Always execute local karma
2017-08-28 10:21:41 +02:00
Pau Perez
f9c0edf4b9
Always execute local karma
...
This ensure the dev will run the version specified in the package.json.
Besides, makes the rake task work as all rails tests, allowing you to
pass a RAILS_ENV.
2017-08-11 16:48:24 +02:00
Enrico Stano
58d7d8f016
Merge pull request #1753 from coopdevs/complete-seed-data
...
Complete seed data to purchase to Enterprise 2
2017-08-11 15:42:03 +02:00
Pau Perez
1f2820f6d4
Add #delivery? in ShippingMethod
2017-08-11 14:41:02 +10:00
Pau Perez
8c5ac4cb23
Fix extra empty line reported by rubocop
2017-08-10 11:35:26 +02:00
Pau Perez
7f982c0c90
Complete seed data to purchase to Enterprise 2
2017-08-02 13:11:41 +02:00
Julius Pabrinkis
c6f6f5bc55
Adapt karma js tests for i18n-js
2017-08-02 09:57:33 +10:00
Rob Harrington
2ca04bb84e
Revert translations of LettuceShare report headers
2017-07-28 12:07:58 +10:00
Rob Harrington
66a85bb99f
Revert translations of Xero report headers
2017-07-28 12:07:52 +10:00
Julius Pabrinkis
8b2b51d511
Fix code style for Rubocop
2017-07-21 12:17:13 +10:00
Julius Pabrinkis
872a150c7d
Refactor some translations to use interpolation
2017-07-21 12:17:13 +10:00
Julius Pabrinkis
5caaec8ef3
Extract translations from mailers and helpers
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
974099747b
Fix failing specs after text extraction
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
55b2c19b64
Extract translations from lib folder
2017-07-21 12:17:12 +10:00
Pau Perez
cee24dcca7
Use indented style for multiline method calls
...
This enables the Rubocop's Style/MultilineMethodCallIndentation cop with
indentend enforced style. Which makes you split multiline method calls like:
orders = Spree::Order
.an_scope
.another_scope
.where(id: list_of_ids)
It also autofixes the current violations and updates the
rubocop_todo.yml
2017-07-12 10:40:53 +02:00
Rob Harrington
e5340cb53a
Rubocop: Correct Lint/UselessAssignment offences, disable for /spec in main config
2017-06-23 16:49:08 +10:00
Rob Harrington
28ea23965b
Rubocop: Correct Lint/AmbiguousOperator offences
2017-06-23 16:49:08 +10:00
Rob Harrington
7bb58342fc
Rubocop: Auto-correct Style/EmptyLineBetweenDefs offences
2017-06-23 16:49:08 +10:00
Rob Harrington
b277ff03ea
Rubocop: Auto-correct Style/TrailingBlankLines offences
2017-06-23 16:49:07 +10:00
Pierre de Lacroix
db63f30a76
cosmetic fixes to the ticket view
2017-05-24 13:35:59 +10:00
Rob Harrington
348ab81c42
Overriding #increment! using variant overrides
2017-05-05 14:20:57 +10:00
Em-AK
c72d17dc83
Run karma task only in test environment
...
and fails otherwise, as it needs the defaults defined in test environment
2017-04-28 11:28:24 +10:00
Pierre de Lacroix
4a9c17cb28
better tax aggregation
2017-04-27 17:32:36 +10:00
Maikel Linke
81877fedb6
Remove useless andand called on scope
2017-04-19 14:28:17 +10:00
Matt-Yorkley
f4eb9cb790
Hubs display as closed when not configured for payment or shipping
2017-04-19 14:28:16 +10:00
Rob Harrington
18472ea8c3
Making 'tax types' report the default sales tax report
2017-03-15 23:56:44 +11:00
Pierre de Lacroix
cc1ef5b28b
fixes on invoice and tax report
2017-03-15 15:04:57 +11:00
Pierre de Lacroix
3fc2070b2c
fix aggregation of taxes for taxes on adjustments
2017-03-15 15:03:46 +11:00
Pierre de Lacroix
d22f5678be
small fixes for sales tax report
2017-03-15 15:03:46 +11:00
Pierre de Lacroix
88a09da325
fix for pull request #1374
2017-03-15 15:03:18 +11:00
Pierre de Lacroix
8570471c00
add tax rates report
2017-03-15 15:03:18 +11:00
Rohan Mitchell
da9a3ce9f3
Refresh products cache when product is deleted (cf. destroyed)
2016-11-25 14:14:42 +11:00
Rohan Mitchell
dabac50128
Replace Enterprise.distributing_product and Enterprise.distributing_any_product_of with Enterprise.distributing_products
2016-11-25 14:14:42 +11:00
Rohan Mitchell
f4f38b4183
Re-apply shop property filters - including performance regression
...
This reverts commit 7d149ed198 .
2016-11-25 14:14:42 +11:00
Rohan Mitchell
48acf80c85
Fix tabbing
2016-11-04 09:39:17 +11:00
Rohan Mitchell
6546d2763b
Add Spree::Money#to_html (from Spree 2.0)
2016-11-04 09:39:17 +11:00
Rohan Mitchell
7f7ee25e27
Money accessors changed to dollars/cents
2016-11-04 09:39:17 +11:00
Rohan Mitchell
a0b740f52d
Generalise fix for missing EnterpriseFee::Calculator to any use of calculated_adjustments
2016-11-04 09:39:17 +11:00
Rohan Mitchell
04a714426f
Integrate from Spree fork: Fix spree issues #3531 and #2210 (patch provided by leiyangyou)
2016-11-04 09:39:17 +11:00
Maikel Linke
d59db1cd97
Merge remote-tracking branch 'origin/master' into uk/delivery-address
2016-10-19 11:01:24 +11:00
Lynne Davis
7eb2dfba48
Update delivery report to use shipping address
2016-10-04 17:04:35 +01:00
Rhodri Karim
8a1d34e711
Fix for issue 1134 - 'Pack by supplier' report now groups by order rather than last name.
2016-09-21 19:41:43 +01:00
Rob Harrington
7d149ed198
Revert shop property filters - causing 10x slowdown
...
This commit reverts commits 7eeee78c4e to e8f96e4818 (inclusive)
2016-09-18 17:46:43 +10:00
Rohan Mitchell
e8f96e4818
When a shop is open, only show taxon badges for currently open order cycles
2016-09-16 11:47:45 +10:00