Matt-Yorkley
4c57addb02
Move shipping fee adjustment from the order to the shipment
2021-03-04 14:27:01 +00:00
Matt-Yorkley
551cb9a2d2
Remove Shipment#cost method
...
Cost is now recorded on the shipment record itself
2021-03-04 14:27:01 +00:00
Matt-Yorkley
81cdc2eac1
Bring in Shipment#update_amounts method
2021-03-04 14:27:01 +00:00
Matt-Yorkley
2a0f132b8b
Improve ShippingMethod -> Shipment association
...
5a54a0b6b0
2021-03-04 14:27:01 +00:00
Pau Pérez Fabregat
d856e006ec
Merge pull request #6989 from andrewpbrett/fix-group-map-icons
...
Update path to +1 map icon
2021-03-04 11:31:17 +01:00
Konrad
748b2b8223
Removed #secure and replaced with class
2021-03-03 20:59:30 +01:00
Konrad
db6eaede14
Shortened long line
2021-03-03 20:58:45 +01:00
Konrad
aa761d6d67
Removed #secure and replaced with class
2021-03-03 20:57:55 +01:00
Konrad
07b23602cd
Included #secure and method show_social_icons?
2021-03-03 20:38:12 +01:00
Konrad
e0108431d9
Added method to check for social icons
2021-03-03 20:36:22 +01:00
Konrad
553954f8bf
Removed "footer .row a" and added "#secure"
2021-03-03 20:35:16 +01:00
Pau Perez
21fb3f3da6
Extract orders relation as a query object
2021-03-03 18:21:10 +01:00
Pau Perez
3b7f45516c
Toggle bulk coop report balance calculation
...
This will make users hit the new method that implements the new
calculation we are aiming for, only if they have the feature enabled.
2021-03-03 18:19:26 +01:00
Pau Perez
cd60cea5de
Extract balance-related methods into module
...
This model concerns helps us put together this related methods. Although
it doesn't provide any encapsulation yet, it makes a bit easier to
consider them all next time we need to change this implementation
somehow. It's a bit of an illusion but it feels like we are making this
God object model a bit smaller.
It also gives more room for documentation that will aid future devs.
2021-03-03 18:19:26 +01:00
Pau Perez
d1fde07535
Extend #outstanding_balance to mimic OustandingBalance
2021-03-03 18:19:26 +01:00
Pau Perez
a3b2a25ccf
Refactor and reuse :not_state scope
2021-03-03 18:19:26 +01:00
Matt-Yorkley
d17ff38a7e
Delete Order#tax_total
...
#display_tax_total is not used anywhere, #tax_total is used in once place but it's not needed.
2021-03-03 11:26:32 +00:00
Andy Brett
5966557b59
update path to +1 map icon
2021-03-02 08:53:13 -08:00
Andy Brett
ad8973d74b
add messages object to order controller
2021-03-01 21:01:34 -08:00
Andy Brett
72b7fe723f
fix indentation
2021-03-01 20:42:05 -08:00
Andy Brett
5751e247bd
Update app/assets/javascripts/darkswarm/controllers/edit_bought_order_controller.js.coffee
2021-03-01 20:42:05 -08:00
Andy Brett
3725ba0fc4
Update app/assets/javascripts/darkswarm/services/cart.js.coffee
2021-03-01 20:42:05 -08:00
Matthew Rieger
651bdad7b9
Fix users removing last item of confirmed order on /cart page
2021-03-01 20:42:05 -08:00
Andy Brett
a02065b66f
allow access to payments tab for canceled orders
2021-03-01 19:51:50 -08:00
Andy Brett
3b15e0ee15
only complete the payment if it is in a completable state
2021-03-01 18:51:14 -08:00
Konrad
3d8cfc4ccd
Updated footer for clean footer
...
Updated the footer to have precise alignment of elements and consistent font sizes throughout the front-end footer.
2021-03-01 20:47:36 +01:00
Konrad
799d35f187
Updated stylesheets for clean footer
...
Updated the stylesheets to have precise alignment fo elements and consistent font sizes throughout the front-end footer.
2021-03-01 20:44:22 +01:00
Jean-Baptiste Bellet
d6cf69df34
Fix vertical alignment using flex
...
- Firefox displayed the icon above the legend
- Use `display: flex;` and `align-items: center;` to vertical align icon and text
2021-03-01 16:40:02 +01:00
Jean-Baptiste Bellet
36573701dc
Use svg icon instead of CSS before
...
CSS can be sometimes a little bit inconsistent to create such an icon. Using SVG is better solution to create beautiful icon.
2021-03-01 16:39:53 +01:00
Pau Pérez Fabregat
7f4849da25
Merge pull request #6971 from Matt-Yorkley/dead-code-assassin
...
Remove dead code Order#display_ship_total
2021-03-01 10:07:30 +01:00
Pau Pérez Fabregat
8d31ba2677
Merge pull request #6966 from Matt-Yorkley/dead-code-totals
...
Dead code of the week
2021-03-01 10:05:31 +01:00
Pau Pérez Fabregat
a0aeb1ceb4
Merge pull request #6889 from mkllnk/6102-footer
...
Emphasise ways to get help in user emails
2021-03-01 09:59:18 +01:00
Matt-Yorkley
4c3ff402e6
Remove dead code Order#display_ship_total
2021-02-28 13:49:38 +00:00
Matt-Yorkley
16eff698df
Remove dead code; Spree::Order #line_item_adjustment_totals and #price_adjustment_totals
2021-02-27 11:56:44 +00:00
Andy Brett
855e38cd73
add I18n
2021-02-26 07:47:58 -08:00
Pau Perez
c3179b4304
Restore table's top rounded corners
2021-02-26 07:44:09 -08:00
Pau Perez
2146ed277f
Fix table header spacing when status is hidden
2021-02-26 07:44:09 -08:00
Pau Perez
ad147ed8f5
Make payment auth table as wide as table below
...
This makes this page look a bit more consistent. Note I also had to fix
the price in the value column.
To do this I pulled out the width property from `.orders` which defines
too many things. This way we can make the auth table full-width while
not being tied to all the other properties which are not needed in this
table. Then, `.orders`'s nested `.order1, .order2` etc. column class
become useless.
2021-02-26 07:44:09 -08:00
Pau Perez
cbb919f28b
Left-align table with table below
2021-02-26 07:44:09 -08:00
Pau Perez
8696882549
Refactor payment auth button to fit into table row
...
This looks a bit more cohesive with the rest of the row cells while
still standing out from the rest.
2021-02-26 07:44:08 -08:00
Andy Brett
c23fb27031
remove unnecessary join
2021-02-26 07:44:08 -08:00
Andy Brett
7bb49b51fd
use scope on payment model
2021-02-26 07:44:08 -08:00
Andy Brett
e5eb8f97f9
add basic feature spec for authorisation table
2021-02-26 07:44:08 -08:00
Andy Brett
0b245ad7b1
make user attr private
2021-02-26 07:44:08 -08:00
Andy Brett
ee351d91a9
show authorization links in separate table
2021-02-26 07:44:08 -08:00
Pau Pérez Fabregat
5ded4ed938
Merge pull request #6958 from Matt-Yorkley/remove-weird-file
...
Remove dead file
2021-02-25 15:56:04 +01:00
Matt-Yorkley
d92de62a0b
I guess this was committed by mistake
2021-02-25 12:56:07 +00:00
Pau Pérez Fabregat
404ec7bf92
Merge pull request #6950 from andrewpbrett/fix-nil-enterprise-category
...
Fix #6949 : Add default icon value if enterprise.category is nil
2021-02-25 13:20:10 +01:00
Andy Brett
bc7477795c
Merge pull request #6910 from andrewpbrett/remove-order-capture
...
Make orders not capturable if they have a payment pending authorization
2021-02-24 12:20:43 -08:00
Pau Pérez Fabregat
d7d86729ad
Merge pull request #6929 from efgalvao/issue#6892
...
Fix the issue #6892
2021-02-24 20:48:27 +01:00
