Merge remote-tracking branch 'origin/master' into github-actions

D3R · Feb 12, 2024 · b4c2f41 · b4c2f41
2 parents 9ca1d11 + ba15124
commit b4c2f41
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
         "php": ">=5.5.0",
         "commerceguys/addressing": "^1.0",
         "commerceguys/zone": "^0.8",
-        "doctrine/collections": "^1.0"
+        "doctrine/collections": "^1.0 || ^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.0",

diff --git a/resources/tax_type/ch_vat.json b/resources/tax_type/ch_vat.json
@@ -24,7 +24,13 @@
                 {
                     "id": "ch_vat_standard_2018",
                     "amount": 0.077,
-                    "start_date": "2018-01-01"
+                    "start_date": "2018-01-01",
+                    "end_date": "2023-12-31"
+                },
+                {
+                    "id": "ch_vat_standard_2024",
+                    "amount": 0.081,
+                    "start_date": "2024-01-01"
                 }
             ]
         },
@@ -47,7 +53,13 @@
                 {
                     "id": "ch_vat_hotel_2018",
                     "amount": 0.037,
-                    "start_date": "2018-01-01"
+                    "start_date": "2018-01-01",
+                    "end_date": "2023-12-31"
+                },
+                {
+                    "id": "ch_vat_hotel_2024",
+                    "amount": 0.038,
+                    "start_date": "2024-01-01"
                 }
             ]
         },
@@ -64,7 +76,13 @@
                 {
                     "id": "ch_vat_reduced_2011",
                     "amount": 0.025,
-                    "start_date": "2011-01-01"
+                    "start_date": "2011-01-01",
+                    "end_date": "2023-12-31"
+                },
+                {
+                    "id": "ch_vat_reduced_2024",
+                    "amount": 0.026,
+                    "start_date": "2024-01-01"
                 }
             ]
         }

diff --git a/resources/tax_type/ee_vat.json b/resources/tax_type/ee_vat.json
@@ -19,7 +19,13 @@
                 {
                     "id": "ee_vat_standard_2009",
                     "amount": 0.2,
-                    "start_date": "2009-07-01"
+                    "start_date": "2009-07-01",
+                    "end_date": "2023-12-31"
+                },
+                {
+                    "id": "ee_vat_standard_2024",
+                    "amount": 0.22,
+                    "start_date": "2024-01-01"
                 }
             ]
         },

diff --git a/resources/tax_type/lu_vat.json b/resources/tax_type/lu_vat.json
@@ -19,7 +19,13 @@
                 {
                     "id": "lu_vat_standard_2015",
                     "amount": 0.17,
-                    "start_date": "2015-01-01"
+                    "start_date": "2015-01-01",
+                    "end_date": "2022-12-31"
+                },
+                {
+                    "id": "lu_vat_standard_2023",
+                    "amount": 0.16,
+                    "start_date": "2023-01-01"
                 }
             ]
         },
@@ -36,7 +42,13 @@
                 {
                     "id": "lu_vat_intermediate_2015",
                     "amount": 0.14,
-                    "start_date": "2015-01-01"
+                    "start_date": "2015-01-01",
+                    "end_date": "2022-12-31"
+                },
+                {
+                    "id": "lu_vat_intermediate_2023",
+                    "amount": 0.13,
+                    "start_date": "2023-01-01"
                 }
             ]
         },
@@ -53,7 +65,13 @@
                 {
                     "id": "lu_vat_reduced_2015",
                     "amount": 0.08,
-                    "start_date": "2015-01-01"
+                    "start_date": "2015-01-01",
+                    "end_date": "2022-12-31"
+                },
+                {
+                    "id": "lu_vat_reduced_2023",
+                    "amount": 0.07,
+                    "start_date": "2023-01-01"
                 }
             ]
         },

diff --git a/resources/tax_type/sg_gst.json b/resources/tax_type/sg_gst.json
@@ -18,7 +18,13 @@
                 {
                     "id": "sg_gst_standard_2023",
                     "amount": 0.08,
-                    "start_date": "2023-01-01"
+                    "start_date": "2023-01-01",
+                    "end_date": "2023-12-31"
+                },
+                {
+                    "id": "sg_gst_standard_2024",
+                    "amount": 0.09,
+                    "start_date": "2024-01-01"
                 }
             ]
         }