diff --git a/.github/workflows/react_release.yml b/.github/workflows/react_release.yml index 55f42040ffdf..bce78bb249c3 100644 --- a/.github/workflows/react_release.yml +++ b/.github/workflows/react_release.yml @@ -48,7 +48,7 @@ jobs: npm i npm run build cp -r dist/* ../public/ - cp dist/index.html ../resources/views/react/index.blade.php + mv dist/index.html ../resources/views/react/index.blade.php - name: Prepare JS/CSS assets run: | diff --git a/app/DataMapper/Tax/BaseRule.php b/app/DataMapper/Tax/BaseRule.php index 78eb1bd9445b..b5b97766d674 100644 --- a/app/DataMapper/Tax/BaseRule.php +++ b/app/DataMapper/Tax/BaseRule.php @@ -379,6 +379,7 @@ class BaseRule implements RuleInterface public function override($item): self { + nlog("override"); $this->tax_rate1 = $item->tax_rate1; $this->tax_name1 = $item->tax_name1; $this->tax_rate2 = $item->tax_rate2; @@ -386,6 +387,7 @@ class BaseRule implements RuleInterface $this->tax_rate3 = $item->tax_rate3; $this->tax_name3 = $item->tax_name3; + nlog($item); return $this; }