Skip to content

Commit

Permalink
Merge pull request #63 from logeecom/master
Browse files Browse the repository at this point in the history
Release version 3.2.18
  • Loading branch information
logeecom authored Jul 21, 2023
2 parents af85460 + aeb2106 commit 4856b33
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 14 deletions.
Binary file not shown.
7 changes: 6 additions & 1 deletion PluginInstallation/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

## [v3.2.17](https://github.com/logeecom/pl_woocommerce_module/compare/v3.2.1...v3.2.1) - 2023-06-06
## [v3.2.18](https://github.com/logeecom/pl_woocommerce_module/compare/v3.2.17...v3.2.18) - 2023-07-19
### Changed
- Fix issues with relay points
- Update phone number validation

## [v3.2.17](https://github.com/logeecom/pl_woocommerce_module/compare/v3.2.16...v3.2.17) - 2023-06-06
### Changed
- Update link to order draft on Packlink

Expand Down
11 changes: 11 additions & 0 deletions src/Components/Checkout/class-checkout-handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,17 @@ public function get_drop_off_locations( $method_id ) {
return $location_service->getLocations( $method_id, $customer['shipping_country'], $customer['shipping_postcode'] );
}

/**
* Displays message about drop-off locations search.
*
* @return void
*/
public function display_drop_off_message() {
if (empty($fields['shipping']['address_1']) || empty($fields['shipping']['address_2']) || empty($fields['shipping']['city']) || empty($fields['shipping']['postcode'])) {
wc_add_notice( __( 'You have to enter your address first in order to search for Drop-Off location.', 'packlink-pro-shipping' ), 'notice' );
}
}

/**
* Returns Packlink shipping method.
*
Expand Down
1 change: 1 addition & 0 deletions src/class-plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,7 @@ private function checkout_hooks_and_actions() {
add_action( 'woocommerce_checkout_create_order', array( $handler, 'checkout_update_shipping_address' ), 10, 2 );
add_action( 'woocommerce_checkout_update_order_meta', array( $handler, 'checkout_update_drop_off' ), 10, 2 );
add_action( 'wp_enqueue_scripts', array( $handler, 'load_scripts' ) );
add_action( 'woocommerce_before_checkout_form', array( $handler, 'display_drop_off_message' ) );
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "packlink/woocommerce",
"description": "Packlink WooCommerce Integration",
"version": "3.2.17",
"version": "3.2.18",
"type": "library",
"repositories": [
{
Expand All @@ -12,7 +12,7 @@
],
"require": {
"php": ">=5.6",
"packlink/integration-core": "3.3.15",
"packlink/integration-core": "3.3.16",
"ext-json": "*",
"ext-curl": "*",
"ext-zip": "*",
Expand Down
14 changes: 7 additions & 7 deletions src/composer.lock

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

2 changes: 1 addition & 1 deletion src/packlink-pro-shipping.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Plugin Name: Packlink PRO Shipping
* Plugin URI: https://en.wordpress.org/plugins/packlink-pro-shipping/
* Description: Save up to 70% on your shipping costs. No fixed fees, no minimum shipping volume required. Manage all your shipments in a single platform.
* Version: 3.2.17
* Version: 3.2.18
* Author: Packlink Shipping S.L.
* Author URI: https://pro.packlink.es/
* License: GPL
Expand Down
8 changes: 7 additions & 1 deletion src/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Tags: woocommerce, shipment, shipping, packlink
Requires at least: 4.7
Requires PHP: 5.5
Tested up to: 6.2
Stable tag: 3.2.17
Stable tag: 3.2.18
License: LICENSE-2.0
License URI: http://www.apache.org/licenses/LICENSE-2.0

Expand Down Expand Up @@ -68,6 +68,12 @@ Click <a href="https://support-pro.packlink.com/hc/es-es/articles/210158585" tar

== Changelog ==

#### 3.2.18 - July 19th, 2023

**Updates**
- Fix issues with relay points
- Update phone number validation

#### 3.2.17 - June 6, 2023

**Updates**
Expand Down
2 changes: 0 additions & 2 deletions src/resources/js/packlink-checkout.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ var Packlink = window.Packlink || {};
function () {
initLocationPicker();
modal.style.display = 'block';
document.body.appendChild(templates);

}
);
}
Expand Down

0 comments on commit 4856b33

Please sign in to comment.