Skip to content

Commit

Permalink
Merge branch 'dev' into 'master'
Browse files Browse the repository at this point in the history
build: release 1.6.4

See merge request calcurates/module-woocommerce!77
  • Loading branch information
Gemorroj committed Jan 12, 2024
2 parents 04e365a + ee01d5e commit 716fe6f
Show file tree
Hide file tree
Showing 19 changed files with 289 additions and 92 deletions.
6 changes: 5 additions & 1 deletion .docker/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ RUN set -xe \
\
# Bcmath
&& docker-php-ext-install bcmath \
&& docker-php-ext-enable bcmath
&& docker-php-ext-enable bcmath \
\
# PCNTL
&& docker-php-ext-install pcntl \
&& docker-php-ext-enable pcntl

# Cleanup
RUN set -xe \
Expand Down
2 changes: 1 addition & 1 deletion assets/lib/air-datepicker/air-datepicker.js

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions assets/lib/air-datepicker/locale/bg.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
var DATEPICKER_LANG = {
days: ["Неделя", "Понеделник", "Вторник", "Сряда", "Четвъртък", "Петък", "Събота"],
daysShort: ["Нед", "Пон", "Вто", "Сря", "Чет", "Пет", "Съб"],
daysMin: ["Нд", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб"],
months: ["Януари", "Февруари", "Март", "Април", "Май", "Юни", "Юли", "Август", "Септември", "Октомври", "Ноември", "Декември"],
monthsShort: ["Яну", "Фев", "Мар", "Апр", "Май", "Юни", "Юли", "Авг", "Сеп", "Окт", "Ное", "Дек"],
today: "Днес",
clear: "Изчисти",
dateFormat: "dd.MM.yyyy",
timeFormat: 'HH:mm',
firstDay: 1
};
12 changes: 12 additions & 0 deletions assets/lib/air-datepicker/locale/ca.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
var DATEPICKER_LANG = {
days: ["Diumenge", "Dilluns", "Dimarts", "Dimecres", "Dijous", "Divendres", "Dissabte"],
daysShort: ["Diu", "Dil", "Dmt", "Dmc", "Dij", "Div", "Dis"],
daysMin: ["dg", "dl", "dt", "dc", "dj", "dv", "ds"],
months: ["Gener", "Febrer", "Març", "Abril", "Maig", "Juny", "Juliol", "Agost", "Setembre", "Octubre", "Novembre", "Desembre"],
monthsShort: ["Gen", "Feb", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Oct", "Nov", "Des"],
today: "Avui",
clear: 'Neteja',
dateFormat: 'dd/MM/yyyy',
timeFormat: 'hh:mm aa',
firstDay: 1
};
12 changes: 12 additions & 0 deletions assets/lib/air-datepicker/locale/hr.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
var DATEPICKER_LANG = {
days: ['Nedjelja', 'Ponedjeljak', 'Utorak', 'Srijeda', 'Četvrtak', 'Petak', 'Subota'],
daysShort: ['Ned', 'Pon', 'Uto', 'Sri', 'Čet', 'Pet', 'Sub'],
daysMin: ['Ne', 'Po', 'Ut', 'Sr', 'Če', 'Pe', 'Su'],
months: ['Siječanj', 'Veljača', 'Ožujak', 'Travanj', 'Svibanj', 'Lipanj', 'Srpanj', 'Kolovoz', 'Rujan', 'Listopad', 'Studeni', 'Prosinac'],
monthsShort: ['Sij', 'Velj', 'Ožu', 'Tra', 'Svi', 'Lip', 'Srp', 'Kol', 'Ruj', 'Lis', 'Stu', 'Pro'],
today: 'Danas',
clear: 'Očisti',
dateFormat: 'dd.MM.yyyy',
timeFormat: 'HH:mm',
firstDay: 1
};
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"type": "wordpress-plugin",
"version": "1.6.3",
"version": "1.6.4",
"config": {
"vendor-dir": "lib",
"optimize-autoloader": true,
Expand Down
92 changes: 49 additions & 43 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
Contributors: calcurates
Tags: woocommerce, shipping rates, shipping methods, shipping carriers, shipping zones, shipping rules, delivery dates, international shipping, table rates, free shipping, in-store pickup, dimensional shipping, multi-origin shipping, dropshipping
Requires at least: 5.2
Tested up to: 6.3
Tested up to: 6.4
Requires PHP: 7.2.5
Stable tag: 1.6.3
Stable tag: 1.6.4
License: GPLv3
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -65,6 +65,9 @@ Calcurates is developed and supported by Amasty. After 10 years of success in de

== Changelog ==

= 1.6.4 =
- Fix: Fixed PHP Warning: Undefined array key "post_data"

= 1.6.3 =
- Add: New variables for shipping method's explanatory text are now supported: min transit days qty - {min_transit_days}, max transit days qty - {max_transit_days}
- Add: Link to "Settings" has been added in the list of plugins
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public function prepare_ship_to_data(): array
$post_data = [];
$customer_session_data = \WC()->session->get('customer', []);

if ($_POST['post_data']) {
if (isset($_POST['post_data']) && $_POST['post_data']) {
\parse_str(\rawurldecode($_POST['post_data']), $post_data);
}

Expand Down

0 comments on commit 716fe6f

Please sign in to comment.