Skip to content
This repository has been archived by the owner on Apr 13, 2023. It is now read-only.

Commit

Permalink
Merge branch 'develop' of github.com:tig-nl/tig-extension-tig-gls-woo…
Browse files Browse the repository at this point in the history
…commerce into develop
  • Loading branch information
tig-daanvandenbergh committed Nov 18, 2020
2 parents 7136ef0 + 815615c commit 380efd0
Show file tree
Hide file tree
Showing 37 changed files with 107 additions and 107 deletions.
6 changes: 3 additions & 3 deletions assets/css/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -26,7 +26,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

#poststuff #gls-order-label .inside {
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"setasign/fpdi-fpdf": "^2.2"
},
"type": "woocommerce-plugin",
"license": "CC-BY-NC-ND-3.0",
"license": "GPL-3.0-or-later",
"version": "1.2.0",
"authors": [
{
Expand Down
4 changes: 2 additions & 2 deletions gls-woocommerce.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* WC Requires at least: 3.8.1
* WC Tested up to: 4.7
*
* License: CC-BY-NC-ND-3.0
* License URI: http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* License: GPLv3 or later
* License URI: http://www.gnu.org/licenses/gpl-3.0.html
* @formatter:on
*/

Expand Down
6 changes: 3 additions & 3 deletions includes/abstracts/abstract-gls-delivery-option.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

if (!defined('ABSPATH')) {
Expand Down
6 changes: 3 additions & 3 deletions includes/admin/class-gls-admin-api-notice.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/
defined( 'ABSPATH' ) || exit;

Expand Down
6 changes: 3 additions & 3 deletions includes/admin/class-gls-admin-assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

if (!defined('ABSPATH')) {
Expand Down
6 changes: 3 additions & 3 deletions includes/admin/class-gls-admin-bulk-actions.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/
defined( 'ABSPATH' ) || exit;

Expand Down
6 changes: 3 additions & 3 deletions includes/admin/class-gls-admin-meta-boxes.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

defined( 'ABSPATH' ) || exit;
Expand Down
6 changes: 3 additions & 3 deletions includes/admin/class-gls-admin-notice.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

defined('ABSPATH') || exit;
Expand Down
6 changes: 3 additions & 3 deletions includes/admin/class-gls-admin-order-columns.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

defined( 'ABSPATH' ) || exit;
Expand Down
6 changes: 3 additions & 3 deletions includes/admin/class-gls-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

if (!defined('ABSPATH')) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

defined('ABSPATH') || exit;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

defined('ABSPATH') || exit;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

defined( 'ABSPATH' ) || exit;
Expand Down
6 changes: 3 additions & 3 deletions includes/api/class-gls-api-get-delivery-options.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

class GLS_Api_Get_Delivery_Options
Expand Down
6 changes: 3 additions & 3 deletions includes/api/class-gls-api-get-parcel-shops.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

class GLS_Api_Get_Parcel_Shops
Expand Down
6 changes: 3 additions & 3 deletions includes/api/class-gls-api-validate-login.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

class GLS_Api_Validate_Login
Expand Down
6 changes: 3 additions & 3 deletions includes/api/label/class-gls-api-label-create.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

class GLS_Api_Label_Create
Expand Down
6 changes: 3 additions & 3 deletions includes/api/label/class-gls-api-label-delete.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

class GLS_Api_Label_Delete
Expand Down
6 changes: 3 additions & 3 deletions includes/class-gls-ajax.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Creative Commons License.
* This source file is subject to the GPLv3 or later.
* It is available through the world-wide-web at this URL:
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* http://www.gnu.org/licenses/gpl-3.0.html
* If you are unable to obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
Expand All @@ -27,7 +27,7 @@
* needs please contact [email protected] for more information.
*
* @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
* @license http://www.gnu.org/licenses/gpl-3.0.html
*/

defined('ABSPATH') || exit;
Expand Down
Loading

0 comments on commit 380efd0

Please sign in to comment.