Konrad
9e6b8e0624
Merge pull request #12047 from rioug/12021-enterprise-fee-tax-on-invoice
...
Include Tax on enterprise fees on the invoice
2024-01-31 15:32:54 +01:00
Gaetan Craig-Riou
e129ef38c2
Refactor total method to use sum instead of reduce
...
Plus some extra specs to cover missing scenarios
2024-01-29 14:12:28 +11:00
Gaetan Craig-Riou
04db8dbd37
Remove unused method
2024-01-29 13:21:13 +11:00
Konrad
ca12eab4bb
Merge pull request #11985 from chahmedejaz/task/11768-add-voucher-in-enterprise-fees-with-tax-by-order-report
...
Include vouchers in report: Enterprise Fees With Tax Report By Order
2024-01-24 22:57:48 +01:00
Konrad
ec4bbe6241
Merge pull request #12038 from mkllnk/dfc-tax-category
...
Spec requiring tax category when creating products
2024-01-24 16:26:57 +01:00
Gaetan Craig-Riou
fab6a79dae
Fix various method to remove or add enterprise fee tax
2024-01-23 10:36:58 +11:00
Gaetan Craig-Riou
bfe8f08910
Refator, add total_additional_tax and total_included_tax
...
They are used to add/remove enterprise fee tax as needed
2024-01-23 10:35:09 +11:00
Gaetan Craig-Riou
3cfa7e29d1
Add the enterprise fee tax to amount with taxes
2024-01-22 13:08:58 +11:00
Gaetan Craig-Riou
913da34228
Add EnterpriseFeeAdjustments
...
It represent a collection of enterprise fee adjustments. Currently
it only allows you to calculate the tax amount relating to enterprise
fees when tax is not included in price
2024-01-22 13:08:39 +11:00
Ahmed Ejaz
cb9c2963af
11768: add roundoff
...
- Fix lint issues
2024-01-19 01:52:24 +05:00
Ahmed Ejaz
38b7616b1a
11768: apply voucher
2024-01-19 01:52:18 +05:00
Konrad
bed405794f
Merge pull request #11762 from binarygit/send-shipment-email-optionally
...
send-shipment-email-optionally
2024-01-18 12:02:00 +01:00
David Cook
f14f325441
Record exception details
...
Why mask the actual exception with a made-up one? The name did convey a bit more context, but Bugsnag tracks the context anyway. It would be more helpful to record the details of the error.
Just in case, I checked if there were any recorded instances of StripeDeauthorizeFailure. I couldn't find any in Bugsnag (last 3 months) for AU, Germany, Katuma, NZ, Norway, UK, USA. Also no mention in GitHub issues.
2024-01-17 15:16:51 +11:00
Gaetan Craig-Riou
aa6392029c
Add #enterprise_fee_adjustments
...
It returns adjustments associated to enterprise fee
2024-01-16 15:40:22 +11:00
binarygit
75ca1dddf1
Fix tests and rubocop warnings
2024-01-14 15:06:02 +05:45
binarygit
aa7a4fb5a2
Send shipment email by default
2024-01-14 15:06:02 +05:45
binarygit
95a51159d7
send-shipment-email-optionally
2024-01-14 15:05:59 +05:45
Maikel Linke
95c6a56e2e
Simplify loading of default tax category
...
The logic doesn't change but I simplified it and added more detailed
specs.
2024-01-12 17:06:24 +11:00
Maikel Linke
78e42ec664
Show Connected Apps only to enterprise managers
...
Super-admins also saw that tab but connecting an app doesn't work unless
you are a manager of that enterprise.
2024-01-11 12:20:40 +11:00
David Cook
2a3d498c13
Style/RedundantReturn
2024-01-10 09:38:35 +11:00
David Cook
7e00dbfd67
Style/RedundantParentheses
2024-01-10 09:38:21 +11:00
David Cook
fbbaf51522
Safely autocorrect Lint/SymbolConversion
...
Inspecting 1530 files
.....................................................................................................................................................................................................................................................................................................................................................W.................................................................................................................................................................................................................................................W..........................................................................................................................................................................................................................................................W.......................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
Offenses:
app/models/spree/preferences/preferable_class_methods.rb:73:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"preferred_#{name}" instead.
"preferred_#{name}".to_sym
^^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:77:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"preferred_#{name}=" instead.
"preferred_#{name}=".to_sym
^^^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:81:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"prefers_#{name}?" instead.
"prefers_#{name}?".to_sym
^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:85:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"prefers_#{name}=" instead.
"prefers_#{name}=".to_sym
^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:89:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"preferred_#{name}_default" instead.
"preferred_#{name}_default".to_sym
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:93:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"preferred_#{name}_type" instead.
"preferred_#{name}_type".to_sym
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:97:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"preferred_#{name}_description" instead.
"preferred_#{name}_description".to_sym
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
app/services/sets/product_set.rb:121:28: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"variant_#{error.attribute}" instead.
product.errors.add("variant_#{error.attribute}".to_sym, error.message)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
lib/spree/core/environment_extension.rb:11:24: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"#{name}=" instead.
create_method( "#{name}=".to_sym ) { |val|
^^^^^^^^^^^^^^^^^
1530 files inspected, 9 offenses detected, 9 offenses corrected
2024-01-10 09:21:43 +11:00
Gaetan Craig-Riou
b0541b0a34
Merge pull request #12004 from mkllnk/default-country
...
Cache default country simply in memory
2024-01-05 14:10:35 +11:00
Maikel Linke
cb3cd3e7ea
Cache default country simply in memory
...
This simplifies the code, avoids a method naming collision with Rails
and should be faster as well.
2024-01-04 13:45:36 +11:00
Mohamed ABDELLANI
d239beb226
remove unnecessary require instructions
2024-01-03 11:34:57 +01:00
Maikel
63ce91d52a
Merge pull request #11954 from mkllnk/delete-app
...
Enterprise user can remove Connected Apps
2024-01-03 11:17:26 +11:00
filipefurtad0
dc9774def6
Removes forgotten comment line
2023-12-21 18:56:11 +00:00
Maikel
9ad60e891e
Merge pull request #11906 from filipefurtad0/add_translation_checks
...
Adds build node to check for i18n exceptions
2023-12-21 09:31:28 +11:00
filipefurtad0
8891091ebb
Uncomments preferences
...
Moves I18n exception handler within base spec helper
2023-12-20 11:16:25 +00:00
Maikel Linke
67ffb5526e
Display loading status in action button
2023-12-20 16:35:00 +11:00
filipefurtad0
57aa151ddd
Comments out default values from superadmin fields to bring the build back to green
2023-12-15 12:48:21 +00:00
Maikel Linke
4eb273b06e
Create ConnectedApp with a reflex
...
I would have like to use a standard form to submit to the reflex but the
whole enterprise settings tab is in a form already and HTML doesn't
allow nested forms. While it does still work in browsers, it would have
added much more HTML to set up a form with a hidden input field instead
of just one additional data attribute.
The whole page is rendered by the controller again but the reflex root
attribute ensures that only parts of this tab are replaced. Otherwise
unsaved data on other tabs could be replaced and the page actually
becomes blank because AngularJS doesn't play well with the morph.
2023-12-15 11:50:04 +11:00
Maikel Linke
2346f03b6f
Add ConnectedApp model
2023-12-15 11:50:04 +11:00
Mohamed ABDELLANI
db653fc945
render the shipping category in the invoice.
2023-12-14 16:36:36 +01:00
Mohamed ABDELLANI
615c001c28
implement Invoice#previous_invoice
2023-12-11 08:26:32 +01:00
Mohamed ABDELLANI
fea910f8b6
update the invoice number rendering
2023-12-08 13:33:36 +01:00
Konrad
7efc6f35b2
Merge pull request #11891 from bmd08a1/ft/search-by-customer-fullname-with-comma
...
Allow searching orders by customers' full name with comma and full name reversed
2023-12-06 21:08:28 +01:00
Dung Bui
8a3aababa1
group specs into one it block, added fullname with comma reversed ransacker
2023-12-04 08:45:19 +07:00
Dung Bui
6206164c30
fix rubocop
2023-12-03 14:28:50 +07:00
Dung Bui
600226cb52
add fullname reversed search
2023-12-03 14:15:41 +07:00
Dung Bui
febda2ce12
add search by fullname with comma
2023-12-03 14:10:12 +07:00
Cillian O'Ruanaidh
b78258c505
Replace references to :split_checkout translation keys with :checkout in views, controllers, etc.
2023-12-01 12:37:13 +00:00
Mohamed ABDELLANI
a0c2facca4
validate price numericality on product and variants
2023-11-28 13:45:08 +01:00
Filipe
e6e4e014dc
Merge pull request #11731 from chahmedejaz/bugfix/11667-clone-tags-issue-for-OC
...
Fix Cloning Tags Issue for OrderCycle
2023-11-17 10:50:33 +00:00
Neal Chambers
c3c4486d0c
Safely autocorrect Style/RedundantStringEscape
...
Inspecting 1513 files
..........................................................................................................................................................................................................................................................................................................................C...........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................C......................................................................................................................................................................................................................................................................................................................................................................................................................................................................C...........................................................................................................
Offenses:
app/models/spree/calculator.rb:31:48: C: [Corrected] Style/RedundantStringEscape: Redundant escape of / inside string literal.
self.class.name.titleize.gsub("Calculator\/", "")
^^
spec/controllers/spree/admin/shipping_methods_controller_spec.rb:40:78: C: [Corrected] Style/RedundantStringEscape: Redundant escape of ' inside string literal.
params[:shipping_method][:calculator_attributes][shipping_amount] = "\'20.0'"
^^
spec/system/admin/enterprise_fees_spec.rb:82:78: C: [Corrected] Style/RedundantStringEscape: Redundant escape of ' inside string literal.
fill_in("#{prefix}_calculator_attributes_preferred_flat_percent", with: "\'20.0'")
^^
spec/system/admin/enterprise_fees_spec.rb:140:42: C: [Corrected] Style/RedundantStringEscape: Redundant escape of ' inside string literal.
'preferred_flat_percent', with: "\'20.0'"
^^
1513 files inspected, 4 offenses detected, 4 offenses corrected
2023-11-17 09:03:32 +09:00
Neal Chambers
edbf4c15a9
Safely autocorrect Style/RedundantReturn
...
Inspecting 1513 files
.........................................................................................................................................................................................................................................................................................................C......................................................C............................................................................................................................................................................................................................................................................................................................................................................................................................................C.........................................................C.......C.........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
Offenses:
app/models/product_import/entry_validator.rb:200:7: C: [Corrected] Style/RedundantReturn: Redundant return detected.
return true unless Float(value, exception: false).nil?
^^^^^^
app/models/spree/stock/availability_validator.rb:30:9: C: [Corrected] Layout/EmptyLineAfterGuardClause: Add empty line after guard clause.
return line_item.target_shipment if line_item.target_shipment
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/stock/availability_validator.rb:31:9: C: [Corrected] Style/RedundantReturn: Redundant return detected.
return line_item.order.shipments.first if line_item.order&.shipments&.any?
^^^^^^
lib/reporting/reports/enterprise_fee_summary/summarizer.rb:41:11: C: [Corrected] Layout/EmptyLineAfterGuardClause: Add empty line after guard clause.
return DataRepresentations::IncomingExchangeLineItemFee if for_incoming_exchange?
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
lib/reporting/reports/enterprise_fee_summary/summarizer.rb:42:11: C: [Corrected] Style/RedundantReturn: Redundant return detected.
return DataRepresentations::OutgoingExchangeLineItemFee if for_outgoing_exchange?
^^^^^^
lib/stripe/authorize_response_patcher.rb:31:7: C: [Corrected] Style/RedundantReturn: Redundant return detected.
return url if url.match(%r{https?://\S+}) && url.include?("stripe.com")
^^^^^^
lib/tasks/data.rake:99:7: C: [Corrected] Style/RedundantReturn: Redundant return detected.
return true if Integer(value)
^^^^^^
1513 files inspected, 7 offenses detected, 7 offenses corrected
2023-11-17 09:00:50 +09:00
Neal Chambers
85fef7ac4b
Safely autocorrect Style/RedundantRegexpArgument
...
Inspecting 1513 files
...........................................................................................................................................................................................................................................................................................................................................................C....................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................C........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
Offenses:
app/models/spree/shipping_method.rb:69:25: C: [Corrected] Style/RedundantRegexpArgument: Use string ":tracking" as argument instead of regexp /:tracking/.
tracking_url.gsub(/:tracking/, tracking) unless tracking.blank? || tracking_url.blank?
^^^^^^^^^^^
lib/spree/i18n.rb:36:17: C: [Corrected] Style/RedundantRegexpArgument: Use string "spree" as argument instead of regexp /spree/.
path.gsub(/spree/, '')
^^^^^^^
1513 files inspected, 2 offenses detected, 2 offenses corrected
2023-11-17 08:59:27 +09:00
Filipe
ed8fd41bec
Merge pull request #11290 from cyrillefr/Orders_in_confirmation_state_cannot_be_completed_by_hub_or_shop
...
Fix Orders in confirmation state cannot be completed by hub or shop
2023-11-16 19:50:14 +00:00
Maikel Linke
a110ee0982
Simplify Active Storage config for test env
2023-11-15 10:29:05 +01:00
Maikel Linke
eaff1ed921
Store report files on the local disk
2023-11-15 10:29:05 +01:00
