Skip to content

Commit

Permalink
Merge branch '7.x' of github.com:doublethreedigital/simple-commerce i…
Browse files Browse the repository at this point in the history
…nto 7.x
  • Loading branch information
duncanmcclean committed Nov 22, 2024
2 parents 885831f + 9fa8d9d commit 63dd615
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion src/Fieldtypes/ProductVariantsFieldtype.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use Statamic\Fields\Fieldtype;
use Statamic\Fields\FieldtypeRepository;
use Statamic\Fields\Validator;
use Statamic\Fields\Values;
use Statamic\Fieldtypes\Textarea;

class ProductVariantsFieldtype extends Fieldtype
Expand Down
2 changes: 1 addition & 1 deletion tests/Tax/StandardTaxEngineTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -763,4 +763,4 @@

// Ensure global order tax is right
expect(170)->toBe($recalculate->taxTotal());
});
});

0 comments on commit 63dd615

Please sign in to comment.