{l s='All'}
diff --git a/admin/themes/default/template/controllers/access/helpers/form/index.php b/admin-dev/themes/default/template/controllers/access/helpers/form/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/access/helpers/form/index.php
rename to admin-dev/themes/default/template/controllers/access/helpers/form/index.php
diff --git a/admin/themes/default/template/controllers/access/helpers/index.php b/admin-dev/themes/default/template/controllers/access/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/access/helpers/index.php
rename to admin-dev/themes/default/template/controllers/access/helpers/index.php
diff --git a/admin/themes/default/template/controllers/access/index.php b/admin-dev/themes/default/template/controllers/access/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/access/index.php
rename to admin-dev/themes/default/template/controllers/access/index.php
diff --git a/admin/themes/default/template/controllers/addons_catalog/content.tpl b/admin-dev/themes/default/template/controllers/addons_catalog/content.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/addons_catalog/content.tpl
rename to admin-dev/themes/default/template/controllers/addons_catalog/content.tpl
diff --git a/admin/themes/default/template/controllers/addons_catalog/index.php b/admin-dev/themes/default/template/controllers/addons_catalog/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/addons_catalog/index.php
rename to admin-dev/themes/default/template/controllers/addons_catalog/index.php
diff --git a/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/addresses/helpers/form/form.tpl
rename to admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
diff --git a/admin/themes/default/template/controllers/addresses/helpers/form/index.php b/admin-dev/themes/default/template/controllers/addresses/helpers/form/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/addresses/helpers/form/index.php
rename to admin-dev/themes/default/template/controllers/addresses/helpers/form/index.php
diff --git a/admin/themes/default/template/controllers/addresses/helpers/index.php b/admin-dev/themes/default/template/controllers/addresses/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/addresses/helpers/index.php
rename to admin-dev/themes/default/template/controllers/addresses/helpers/index.php
diff --git a/admin/themes/default/template/controllers/addresses/helpers/list/index.php b/admin-dev/themes/default/template/controllers/addresses/helpers/list/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/addresses/helpers/list/index.php
rename to admin-dev/themes/default/template/controllers/addresses/helpers/list/index.php
diff --git a/admin/themes/default/template/controllers/addresses/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/addresses/helpers/list/list_header.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/addresses/helpers/list/list_header.tpl
rename to admin-dev/themes/default/template/controllers/addresses/helpers/list/list_header.tpl
diff --git a/admin/themes/default/template/controllers/addresses/index.php b/admin-dev/themes/default/template/controllers/addresses/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/addresses/index.php
rename to admin-dev/themes/default/template/controllers/addresses/index.php
diff --git a/admin/themes/default/template/controllers/attachments/helpers/list/list_action_delete.tpl b/admin-dev/themes/default/template/controllers/attachments/helpers/list/list_action_delete.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/attachments/helpers/list/list_action_delete.tpl
rename to admin-dev/themes/default/template/controllers/attachments/helpers/list/list_action_delete.tpl
diff --git a/admin/themes/default/template/controllers/attachments/index.php b/admin-dev/themes/default/template/controllers/attachments/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/attachments/index.php
rename to admin-dev/themes/default/template/controllers/attachments/index.php
diff --git a/admin/themes/default/template/controllers/attribute_generator/content.tpl b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/attribute_generator/content.tpl
rename to admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
diff --git a/admin/themes/default/template/controllers/attribute_generator/index.php b/admin-dev/themes/default/template/controllers/attribute_generator/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/attribute_generator/index.php
rename to admin-dev/themes/default/template/controllers/attribute_generator/index.php
diff --git a/admin/themes/default/template/controllers/attributes/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/attributes/helpers/form/form.tpl
rename to admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
diff --git a/admin/themes/default/template/controllers/attributes/helpers/form/index.php b/admin-dev/themes/default/template/controllers/attributes/helpers/form/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/attributes/helpers/form/index.php
rename to admin-dev/themes/default/template/controllers/attributes/helpers/form/index.php
diff --git a/admin/themes/default/template/controllers/attributes/helpers/index.php b/admin-dev/themes/default/template/controllers/attributes/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/attributes/helpers/index.php
rename to admin-dev/themes/default/template/controllers/attributes/helpers/index.php
diff --git a/admin/themes/default/template/controllers/attributes/index.php b/admin-dev/themes/default/template/controllers/attributes/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/attributes/index.php
rename to admin-dev/themes/default/template/controllers/attributes/index.php
diff --git a/admin/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl
rename to admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl
diff --git a/admin/themes/default/template/controllers/attributes_groups/helpers/form/index.php b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/attributes_groups/helpers/form/index.php
rename to admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/index.php
diff --git a/admin/themes/default/template/controllers/attributes_groups/helpers/index.php b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/attributes_groups/helpers/index.php
rename to admin-dev/themes/default/template/controllers/attributes_groups/helpers/index.php
diff --git a/admin/themes/default/template/controllers/attributes_groups/helpers/list/index.php b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/attributes_groups/helpers/list/index.php
rename to admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/index.php
diff --git a/admin/themes/default/template/controllers/attributes_groups/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/list_header.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/attributes_groups/helpers/list/list_header.tpl
rename to admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/list_header.tpl
diff --git a/admin/themes/default/template/controllers/attributes_groups/helpers/view/index.php b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/view/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/attributes_groups/helpers/view/index.php
rename to admin-dev/themes/default/template/controllers/attributes_groups/helpers/view/index.php
diff --git a/admin/themes/default/template/controllers/attributes_groups/index.php b/admin-dev/themes/default/template/controllers/attributes_groups/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/attributes_groups/index.php
rename to admin-dev/themes/default/template/controllers/attributes_groups/index.php
diff --git a/admin/themes/default/template/controllers/backup/download/index.php b/admin-dev/themes/default/template/controllers/backup/download/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/backup/download/index.php
rename to admin-dev/themes/default/template/controllers/backup/download/index.php
diff --git a/admin/themes/default/template/controllers/backup/download/view.tpl b/admin-dev/themes/default/template/controllers/backup/download/view.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/backup/download/view.tpl
rename to admin-dev/themes/default/template/controllers/backup/download/view.tpl
diff --git a/admin/themes/default/template/controllers/backup/helpers/index.php b/admin-dev/themes/default/template/controllers/backup/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/backup/helpers/index.php
rename to admin-dev/themes/default/template/controllers/backup/helpers/index.php
diff --git a/admin/themes/default/template/controllers/backup/helpers/list/index.php b/admin-dev/themes/default/template/controllers/backup/helpers/list/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/backup/helpers/list/index.php
rename to admin-dev/themes/default/template/controllers/backup/helpers/list/index.php
diff --git a/admin/themes/default/template/controllers/backup/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
similarity index 92%
rename from admin/themes/default/template/controllers/backup/helpers/list/list_header.tpl
rename to admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
index 341197364..1fe43c383 100644
--- a/admin/themes/default/template/controllers/backup/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
@@ -68,14 +68,14 @@
{if $host_mode}
diff --git a/admin/themes/default/template/controllers/backup/helpers/view/index.php b/admin-dev/themes/default/template/controllers/backup/helpers/view/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/backup/helpers/view/index.php
rename to admin-dev/themes/default/template/controllers/backup/helpers/view/index.php
diff --git a/admin/themes/default/template/controllers/backup/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/backup/helpers/view/view.tpl
rename to admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl
diff --git a/admin/themes/default/template/controllers/backup/index.php b/admin-dev/themes/default/template/controllers/backup/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/backup/index.php
rename to admin-dev/themes/default/template/controllers/backup/index.php
diff --git a/admin/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
rename to admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
diff --git a/admin/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
rename to admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
diff --git a/admin/themes/default/template/controllers/carrier_wizard/helpers/form/index.php b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/carrier_wizard/helpers/form/index.php
rename to admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/index.php
diff --git a/admin/themes/default/template/controllers/carrier_wizard/helpers/index.php b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/carrier_wizard/helpers/index.php
rename to admin-dev/themes/default/template/controllers/carrier_wizard/helpers/index.php
diff --git a/admin/themes/default/template/controllers/carrier_wizard/helpers/view/index.php b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/carrier_wizard/helpers/view/index.php
rename to admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/index.php
diff --git a/admin/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
rename to admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
diff --git a/admin/themes/default/template/controllers/carrier_wizard/index.php b/admin-dev/themes/default/template/controllers/carrier_wizard/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/carrier_wizard/index.php
rename to admin-dev/themes/default/template/controllers/carrier_wizard/index.php
diff --git a/admin/themes/default/template/controllers/carrier_wizard/logo.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/carrier_wizard/logo.tpl
rename to admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl
diff --git a/admin/themes/default/template/controllers/carrier_wizard/summary.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/carrier_wizard/summary.tpl
rename to admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
diff --git a/admin/themes/default/template/controllers/carriers/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/carriers/helpers/form/form.tpl
rename to admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl
diff --git a/admin/themes/default/template/controllers/carriers/helpers/form/index.php b/admin-dev/themes/default/template/controllers/carriers/helpers/form/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/carriers/helpers/form/index.php
rename to admin-dev/themes/default/template/controllers/carriers/helpers/form/index.php
diff --git a/admin/themes/default/template/controllers/carriers/helpers/index.php b/admin-dev/themes/default/template/controllers/carriers/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/carriers/helpers/index.php
rename to admin-dev/themes/default/template/controllers/carriers/helpers/index.php
diff --git a/admin/themes/default/template/controllers/carriers/helpers/list/index.php b/admin-dev/themes/default/template/controllers/carriers/helpers/list/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/carriers/helpers/list/index.php
rename to admin-dev/themes/default/template/controllers/carriers/helpers/list/index.php
diff --git a/admin/themes/default/template/controllers/carriers/helpers/list/list_content.tpl b/admin-dev/themes/default/template/controllers/carriers/helpers/list/list_content.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/carriers/helpers/list/list_content.tpl
rename to admin-dev/themes/default/template/controllers/carriers/helpers/list/list_content.tpl
diff --git a/admin/themes/default/template/controllers/carriers/helpers/view/index.php b/admin-dev/themes/default/template/controllers/carriers/helpers/view/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/carriers/helpers/view/index.php
rename to admin-dev/themes/default/template/controllers/carriers/helpers/view/index.php
diff --git a/admin/themes/default/template/controllers/carriers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carriers/helpers/view/view.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/carriers/helpers/view/view.tpl
rename to admin-dev/themes/default/template/controllers/carriers/helpers/view/view.tpl
diff --git a/admin/themes/default/template/controllers/carriers/index.php b/admin-dev/themes/default/template/controllers/carriers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/carriers/index.php
rename to admin-dev/themes/default/template/controllers/carriers/index.php
diff --git a/admin/themes/default/template/controllers/cart_rules/actions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/cart_rules/actions.tpl
rename to admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
diff --git a/admin/themes/default/template/controllers/cart_rules/conditions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
similarity index 91%
rename from admin/themes/default/template/controllers/cart_rules/conditions.tpl
rename to admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
index 8f225fbbf..940a17f8e 100644
--- a/admin/themes/default/template/controllers/cart_rules/conditions.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
@@ -220,6 +220,38 @@
diff --git a/admin/themes/default/template/controllers/carts/index.php b/admin-dev/themes/default/template/controllers/carts/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/carts/index.php
rename to admin-dev/themes/default/template/controllers/carts/index.php
diff --git a/admin/themes/default/template/controllers/categories/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/categories/helpers/form/form.tpl
rename to admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
diff --git a/admin/themes/default/template/controllers/categories/helpers/form/index.php b/admin-dev/themes/default/template/controllers/categories/helpers/form/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/categories/helpers/form/index.php
rename to admin-dev/themes/default/template/controllers/categories/helpers/form/index.php
diff --git a/admin/themes/default/template/controllers/categories/helpers/index.php b/admin-dev/themes/default/template/controllers/categories/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/categories/helpers/index.php
rename to admin-dev/themes/default/template/controllers/categories/helpers/index.php
diff --git a/admin/themes/default/template/controllers/categories/helpers/list/index.php b/admin-dev/themes/default/template/controllers/categories/helpers/list/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/categories/helpers/list/index.php
rename to admin-dev/themes/default/template/controllers/categories/helpers/list/index.php
diff --git a/admin/themes/default/template/controllers/categories/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/categories/helpers/list/list_header.tpl
rename to admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
diff --git a/admin/themes/default/template/controllers/categories/index.php b/admin-dev/themes/default/template/controllers/categories/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/categories/index.php
rename to admin-dev/themes/default/template/controllers/categories/index.php
diff --git a/admin/themes/default/template/controllers/cms/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/cms/helpers/form/form.tpl
rename to admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
diff --git a/admin/themes/default/template/controllers/cms/helpers/form/index.php b/admin-dev/themes/default/template/controllers/cms/helpers/form/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/cms/helpers/form/index.php
rename to admin-dev/themes/default/template/controllers/cms/helpers/form/index.php
diff --git a/admin/themes/default/template/controllers/cms/helpers/index.php b/admin-dev/themes/default/template/controllers/cms/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/cms/helpers/index.php
rename to admin-dev/themes/default/template/controllers/cms/helpers/index.php
diff --git a/admin/themes/default/template/controllers/cms/index.php b/admin-dev/themes/default/template/controllers/cms/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/cms/index.php
rename to admin-dev/themes/default/template/controllers/cms/index.php
diff --git a/admin/themes/default/template/controllers/cms_categories/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
rename to admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
diff --git a/admin/themes/default/template/controllers/cms_categories/helpers/form/index.php b/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/cms_categories/helpers/form/index.php
rename to admin-dev/themes/default/template/controllers/cms_categories/helpers/form/index.php
diff --git a/admin/themes/default/template/controllers/cms_categories/helpers/index.php b/admin-dev/themes/default/template/controllers/cms_categories/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/cms_categories/helpers/index.php
rename to admin-dev/themes/default/template/controllers/cms_categories/helpers/index.php
diff --git a/admin/themes/default/template/controllers/cms_categories/index.php b/admin-dev/themes/default/template/controllers/cms_categories/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/cms_categories/index.php
rename to admin-dev/themes/default/template/controllers/cms_categories/index.php
diff --git a/admin/themes/default/template/controllers/cms_content/content.tpl b/admin-dev/themes/default/template/controllers/cms_content/content.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/cms_content/content.tpl
rename to admin-dev/themes/default/template/controllers/cms_content/content.tpl
diff --git a/admin/themes/default/template/controllers/cms_content/index.php b/admin-dev/themes/default/template/controllers/cms_content/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/cms_content/index.php
rename to admin-dev/themes/default/template/controllers/cms_content/index.php
diff --git a/admin/themes/default/template/controllers/countries/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/countries/helpers/form/form.tpl
rename to admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
diff --git a/admin/themes/default/template/controllers/countries/helpers/form/index.php b/admin-dev/themes/default/template/controllers/countries/helpers/form/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/countries/helpers/form/index.php
rename to admin-dev/themes/default/template/controllers/countries/helpers/form/index.php
diff --git a/admin/themes/default/template/controllers/countries/helpers/index.php b/admin-dev/themes/default/template/controllers/countries/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/countries/helpers/index.php
rename to admin-dev/themes/default/template/controllers/countries/helpers/index.php
diff --git a/admin/themes/default/template/controllers/countries/helpers/list/index.php b/admin-dev/themes/default/template/controllers/countries/helpers/list/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/countries/helpers/list/index.php
rename to admin-dev/themes/default/template/controllers/countries/helpers/list/index.php
diff --git a/admin/themes/default/template/controllers/countries/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
rename to admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
diff --git a/admin/themes/default/template/controllers/countries/index.php b/admin-dev/themes/default/template/controllers/countries/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/countries/index.php
rename to admin-dev/themes/default/template/controllers/countries/index.php
diff --git a/admin/themes/default/template/controllers/customer_threads/helpers/index.php b/admin-dev/themes/default/template/controllers/customer_threads/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/customer_threads/helpers/index.php
rename to admin-dev/themes/default/template/controllers/customer_threads/helpers/index.php
diff --git a/admin/themes/default/template/controllers/customer_threads/helpers/list/index.php b/admin-dev/themes/default/template/controllers/customer_threads/helpers/list/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/customer_threads/helpers/list/index.php
rename to admin-dev/themes/default/template/controllers/customer_threads/helpers/list/index.php
diff --git a/admin/themes/default/template/controllers/customer_threads/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/list/list_header.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/customer_threads/helpers/list/list_header.tpl
rename to admin-dev/themes/default/template/controllers/customer_threads/helpers/list/list_header.tpl
diff --git a/admin/themes/default/template/controllers/customer_threads/helpers/options/index.php b/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/customer_threads/helpers/options/index.php
rename to admin-dev/themes/default/template/controllers/customer_threads/helpers/options/index.php
diff --git a/admin/themes/default/template/controllers/customer_threads/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/customer_threads/helpers/options/options.tpl
rename to admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl
diff --git a/admin/themes/default/template/controllers/customer_threads/helpers/view/index.php b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/customer_threads/helpers/view/index.php
rename to admin-dev/themes/default/template/controllers/customer_threads/helpers/view/index.php
diff --git a/admin/themes/default/template/controllers/customer_threads/helpers/view/message.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/message.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/customer_threads/helpers/view/message.tpl
rename to admin-dev/themes/default/template/controllers/customer_threads/helpers/view/message.tpl
diff --git a/admin/themes/default/template/controllers/customer_threads/helpers/view/modal.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/modal.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/customer_threads/helpers/view/modal.tpl
rename to admin-dev/themes/default/template/controllers/customer_threads/helpers/view/modal.tpl
diff --git a/admin/themes/default/template/controllers/customer_threads/helpers/view/timeline_item.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/timeline_item.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/customer_threads/helpers/view/timeline_item.tpl
rename to admin-dev/themes/default/template/controllers/customer_threads/helpers/view/timeline_item.tpl
diff --git a/admin/themes/default/template/controllers/customer_threads/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/customer_threads/helpers/view/view.tpl
rename to admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl
diff --git a/admin/themes/default/template/controllers/customer_threads/index.php b/admin-dev/themes/default/template/controllers/customer_threads/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/customer_threads/index.php
rename to admin-dev/themes/default/template/controllers/customer_threads/index.php
diff --git a/admin/themes/default/template/controllers/customer_threads/message.tpl b/admin-dev/themes/default/template/controllers/customer_threads/message.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/customer_threads/message.tpl
rename to admin-dev/themes/default/template/controllers/customer_threads/message.tpl
diff --git a/admin/themes/default/template/controllers/customer_threads/page_header_toolbar.tpl b/admin-dev/themes/default/template/controllers/customer_threads/page_header_toolbar.tpl
similarity index 94%
rename from admin/themes/default/template/controllers/customer_threads/page_header_toolbar.tpl
rename to admin-dev/themes/default/template/controllers/customer_threads/page_header_toolbar.tpl
index 9378f1eaf..8597f1679 100644
--- a/admin/themes/default/template/controllers/customer_threads/page_header_toolbar.tpl
+++ b/admin-dev/themes/default/template/controllers/customer_threads/page_header_toolbar.tpl
@@ -28,7 +28,7 @@
{if is_array($title)}
{$title|end|strip_tags}
{else}
-
+
{$title|strip_tags|truncate:40}
{/if}
diff --git a/admin/themes/default/template/controllers/customers/helpers/index.php b/admin-dev/themes/default/template/controllers/customers/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/customers/helpers/index.php
rename to admin-dev/themes/default/template/controllers/customers/helpers/index.php
diff --git a/admin/themes/default/template/controllers/customers/helpers/list/index.php b/admin-dev/themes/default/template/controllers/customers/helpers/list/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/customers/helpers/list/index.php
rename to admin-dev/themes/default/template/controllers/customers/helpers/list/index.php
diff --git a/admin/themes/default/template/controllers/customers/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/customers/helpers/list/list_header.tpl
rename to admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
diff --git a/admin/themes/default/template/controllers/customers/helpers/required_fields.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/required_fields.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/customers/helpers/required_fields.tpl
rename to admin-dev/themes/default/template/controllers/customers/helpers/required_fields.tpl
diff --git a/admin/themes/default/template/controllers/customers/helpers/view/index.php b/admin-dev/themes/default/template/controllers/customers/helpers/view/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/customers/helpers/view/index.php
rename to admin-dev/themes/default/template/controllers/customers/helpers/view/index.php
diff --git a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
similarity index 99%
rename from admin/themes/default/template/controllers/customers/helpers/view/view.tpl
rename to admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
index 4f52451c7..afedb3edd 100644
--- a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
@@ -72,6 +72,12 @@
+
+ {l s='Nationality'}
+
+
{if $nationality}{$nationality}{else}--{/if}
+
+
{l s='Registration Date'}
diff --git a/admin/themes/default/template/controllers/customers/index.php b/admin-dev/themes/default/template/controllers/customers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/customers/index.php
rename to admin-dev/themes/default/template/controllers/customers/index.php
diff --git a/admin/themes/default/template/controllers/customers/modals/_customer_guest_form.tpl b/admin-dev/themes/default/template/controllers/customers/modals/_customer_guest_form.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/customers/modals/_customer_guest_form.tpl
rename to admin-dev/themes/default/template/controllers/customers/modals/_customer_guest_form.tpl
diff --git a/admin/themes/default/template/controllers/customers/modals/index.php b/admin-dev/themes/default/template/controllers/customers/modals/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/customers/modals/index.php
rename to admin-dev/themes/default/template/controllers/customers/modals/index.php
diff --git a/admin/themes/default/template/controllers/dashboard/helpers/index.php b/admin-dev/themes/default/template/controllers/dashboard/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/dashboard/helpers/index.php
rename to admin-dev/themes/default/template/controllers/dashboard/helpers/index.php
diff --git a/admin/themes/default/template/controllers/dashboard/helpers/view/index.php b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/dashboard/helpers/view/index.php
rename to admin-dev/themes/default/template/controllers/dashboard/helpers/view/index.php
diff --git a/admin/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/dashboard/helpers/view/view.tpl
rename to admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
diff --git a/admin/themes/default/template/controllers/dashboard/index.php b/admin-dev/themes/default/template/controllers/dashboard/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/dashboard/index.php
rename to admin-dev/themes/default/template/controllers/dashboard/index.php
diff --git a/admin/themes/default/template/controllers/emails/content.tpl b/admin-dev/themes/default/template/controllers/emails/content.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/emails/content.tpl
rename to admin-dev/themes/default/template/controllers/emails/content.tpl
diff --git a/admin/themes/default/template/controllers/emails/index.php b/admin-dev/themes/default/template/controllers/emails/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/emails/index.php
rename to admin-dev/themes/default/template/controllers/emails/index.php
diff --git a/admin/themes/default/template/controllers/employees/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/employees/helpers/form/form.tpl
rename to admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
diff --git a/admin/themes/default/template/controllers/employees/helpers/form/index.php b/admin-dev/themes/default/template/controllers/employees/helpers/form/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/employees/helpers/form/index.php
rename to admin-dev/themes/default/template/controllers/employees/helpers/form/index.php
diff --git a/admin/themes/default/template/controllers/employees/helpers/index.php b/admin-dev/themes/default/template/controllers/employees/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/employees/helpers/index.php
rename to admin-dev/themes/default/template/controllers/employees/helpers/index.php
diff --git a/admin/themes/default/template/controllers/employees/index.php b/admin-dev/themes/default/template/controllers/employees/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/employees/index.php
rename to admin-dev/themes/default/template/controllers/employees/index.php
diff --git a/admin/themes/default/template/controllers/feature_value/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/feature_value/helpers/form/form.tpl
rename to admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl
diff --git a/admin/themes/default/template/controllers/feature_value/helpers/form/index.php b/admin-dev/themes/default/template/controllers/feature_value/helpers/form/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/feature_value/helpers/form/index.php
rename to admin-dev/themes/default/template/controllers/feature_value/helpers/form/index.php
diff --git a/admin/themes/default/template/controllers/feature_value/helpers/index.php b/admin-dev/themes/default/template/controllers/feature_value/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/feature_value/helpers/index.php
rename to admin-dev/themes/default/template/controllers/feature_value/helpers/index.php
diff --git a/admin/themes/default/template/controllers/feature_value/index.php b/admin-dev/themes/default/template/controllers/feature_value/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/feature_value/index.php
rename to admin-dev/themes/default/template/controllers/feature_value/index.php
diff --git a/admin/themes/default/template/controllers/features/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/features/helpers/form/form.tpl
rename to admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl
diff --git a/admin/themes/default/template/controllers/features/helpers/form/index.php b/admin-dev/themes/default/template/controllers/features/helpers/form/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/features/helpers/form/index.php
rename to admin-dev/themes/default/template/controllers/features/helpers/form/index.php
diff --git a/admin/themes/default/template/controllers/features/helpers/index.php b/admin-dev/themes/default/template/controllers/features/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/features/helpers/index.php
rename to admin-dev/themes/default/template/controllers/features/helpers/index.php
diff --git a/admin/themes/default/template/controllers/features/index.php b/admin-dev/themes/default/template/controllers/features/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/features/index.php
rename to admin-dev/themes/default/template/controllers/features/index.php
diff --git a/admin/themes/default/template/controllers/geolocation/helpers/index.php b/admin-dev/themes/default/template/controllers/geolocation/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/geolocation/helpers/index.php
rename to admin-dev/themes/default/template/controllers/geolocation/helpers/index.php
diff --git a/admin/themes/default/template/controllers/geolocation/helpers/options/index.php b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/geolocation/helpers/options/index.php
rename to admin-dev/themes/default/template/controllers/geolocation/helpers/options/index.php
diff --git a/admin/themes/default/template/controllers/geolocation/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/geolocation/helpers/options/options.tpl
rename to admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl
diff --git a/admin/themes/default/template/controllers/geolocation/index.php b/admin-dev/themes/default/template/controllers/geolocation/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/geolocation/index.php
rename to admin-dev/themes/default/template/controllers/geolocation/index.php
diff --git a/admin/themes/default/template/controllers/groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/groups/helpers/form/form.tpl
rename to admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
diff --git a/admin/themes/default/template/controllers/groups/helpers/form/index.php b/admin-dev/themes/default/template/controllers/groups/helpers/form/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/groups/helpers/form/index.php
rename to admin-dev/themes/default/template/controllers/groups/helpers/form/index.php
diff --git a/admin/themes/default/template/controllers/groups/helpers/index.php b/admin-dev/themes/default/template/controllers/groups/helpers/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/groups/helpers/index.php
rename to admin-dev/themes/default/template/controllers/groups/helpers/index.php
diff --git a/admin/themes/default/template/controllers/groups/helpers/tree/index.php b/admin-dev/themes/default/template/controllers/groups/helpers/tree/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/groups/helpers/tree/index.php
rename to admin-dev/themes/default/template/controllers/groups/helpers/tree/index.php
diff --git a/admin/themes/default/template/controllers/groups/helpers/tree/tree_categories.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_categories.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/groups/helpers/tree/tree_categories.tpl
rename to admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_categories.tpl
diff --git a/admin/themes/default/template/controllers/groups/helpers/tree/tree_node_folder_radio.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_folder_radio.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/groups/helpers/tree/tree_node_folder_radio.tpl
rename to admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_folder_radio.tpl
diff --git a/admin/themes/default/template/controllers/groups/helpers/tree/tree_node_item_radio.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_item_radio.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/groups/helpers/tree/tree_node_item_radio.tpl
rename to admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_item_radio.tpl
diff --git a/admin/themes/default/template/controllers/groups/helpers/view/index.php b/admin-dev/themes/default/template/controllers/groups/helpers/view/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/groups/helpers/view/index.php
rename to admin-dev/themes/default/template/controllers/groups/helpers/view/index.php
diff --git a/admin/themes/default/template/controllers/groups/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
similarity index 100%
rename from admin/themes/default/template/controllers/groups/helpers/view/view.tpl
rename to admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
diff --git a/admin/themes/default/template/controllers/groups/index.php b/admin-dev/themes/default/template/controllers/groups/index.php
similarity index 100%
rename from admin/themes/default/template/controllers/groups/index.php
rename to admin-dev/themes/default/template/controllers/groups/index.php
diff --git a/admin-dev/themes/default/template/controllers/guest_registration/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/guest_registration/helpers/view/view.tpl
new file mode 100644
index 000000000..91b33e572
--- /dev/null
+++ b/admin-dev/themes/default/template/controllers/guest_registration/helpers/view/view.tpl
@@ -0,0 +1,68 @@
+{**
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License version 3.0
+* that is bundled with this package in the file LICENSE.md
+* It is also available through the world-wide-web at this URL:
+* https://opensource.org/license/osl-3-0-php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to support@qloapps.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to a newer
+* versions in the future. If you wish to customize this module for your needs
+* please refer to https://store.webkul.com/customisation-guidelines for more information.
+*
+* @author Webkul IN
+* @copyright Since 2010 Webkul
+* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+*}
+
+
diff --git a/admin-dev/themes/default/template/controllers/guest_registration/index.php b/admin-dev/themes/default/template/controllers/guest_registration/index.php
new file mode 100644
index 000000000..e7a621e6c
--- /dev/null
+++ b/admin-dev/themes/default/template/controllers/guest_registration/index.php
@@ -0,0 +1,32 @@
+
-
{l s='PrestaShop has detected that your server configuration is not compatible with the new storage system (directive "safe_mode" is activated). You should therefore continue to use the existing system.'}
+
{l s='QloApps has detected that your server configuration is not compatible with the new storage system (directive "safe_mode" is activated). You should therefore continue to use the existing system.'}
+
+{/if}
\ No newline at end of file
diff --git a/mails/en/bookings_refund_request_detail_admin.tpl b/mails/en/bookings_refund_request_detail_admin.tpl
index 657124172..67a13baea 100644
--- a/mails/en/bookings_refund_request_detail_admin.tpl
+++ b/mails/en/bookings_refund_request_detail_admin.tpl
@@ -7,7 +7,7 @@
+ Your order with the reference {order_name} has been marked as No-show.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Here are your order details:
+
+
+ Order reference: {order_name}
+ Order total: {total_paid}
+
+
+
+ {order_hotel_detail_html}
+
+
+
+
+
+
+
+
+
+{extra_mail_content_html}
+
+
+
+
+ You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
+
+
+
+
+
+
+
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
+
+
+
+
\ No newline at end of file
diff --git a/mails/en/no_show.txt b/mails/en/no_show.txt
new file mode 100644
index 000000000..70b07b093
--- /dev/null
+++ b/mails/en/no_show.txt
@@ -0,0 +1,31 @@
+
+[/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Your order with the reference {order_name} from {hotel_hotel_name} has
+been marked as No-show.
+
+Here are your order details:
+Order reference: {order_name}
+Order total: {total_paid}
+Total Rooms: {num_rooms}
+
+Hotel details:
+Hotel Name: {hotel_hotel_name}
+Hotel Phone: {hotel_phone}
+Hotel Email: {hotel_email}
+
+{extra_mail_content_txt}
+
+You can review your order and download your invoice from the
+"Order history" [/{history_url}] section of your customer account by
+clicking "My account" [/{my_account_url}] on our website.
+
+If you have a guest account, you can follow your order via the
+"Guest Tracking" [/{guest_tracking_url}?id_order={order_name}] section
+on our website.
+
+{shop_name} [/{shop_url}] powered by Webkul(tm)
+[https://webkul.com]
+
diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html
index dc29689fd..7b6eab585 100755
--- a/mails/en/order_conf.html
+++ b/mails/en/order_conf.html
@@ -108,7 +108,7 @@
@@ -314,7 +331,7 @@
{/if} -->
- icon-calendar
- Created with Sketch.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/qloicsexport/views/img/index.php b/modules/qloicsexport/views/img/index.php
deleted file mode 100644
index 1ac4dd02b..000000000
--- a/modules/qloicsexport/views/img/index.php
+++ /dev/null
@@ -1,32 +0,0 @@
-= checkIn && dmy <= checkOut)) {
- return [true, 'in-select-date-range', ''];
- }
- }
-
- return [true, ''];
-}
\ No newline at end of file
diff --git a/modules/qloicsexport/views/js/index.php b/modules/qloicsexport/views/js/index.php
deleted file mode 100644
index 1ac4dd02b..000000000
--- a/modules/qloicsexport/views/js/index.php
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
{l s='Export iCalendar File' mod='qloicsexport'}
-
-
-
-
- {* here put all the fields for download *}
-
-
- {l s='Hotels' mod='qloicsexport'}
-
-
-
-
-
-
-
-
- {l s='Date From' mod='qloicsexport'}
-
-
-
-
-
-
-
-
-
-
-
- {l s='Date To' mod='qloicsexport'}
-
-
-
-
-
-
-
-
-
-
-
-
- ** {l s='You can choose parameters from the above fields for exporting the iCalendar (.ics) file of your bookings. For all bookings, leave the fields blank.' mod='qloicsexport'}
-
-
-
-
-
-
-
-
-
-{/if}
\ No newline at end of file
diff --git a/modules/qloicsexport/views/templates/hook/index.php b/modules/qloicsexport/views/templates/hook/index.php
deleted file mode 100644
index 1ac4dd02b..000000000
--- a/modules/qloicsexport/views/templates/hook/index.php
+++ /dev/null
@@ -1,32 +0,0 @@
-execute(
+ 'UPDATE `'._DB_PREFIX_.'wk_paypal_commerce_order`
+ SET `pp_payment_status` = "'.pSQL($payment_status).'"
+ WHERE `pp_transaction_id` = "'.pSQL($transaction_id).'"
+ '
+ );
+ }
+
+ public static function updateOrderPaypalOrderStatus($transaction_id, $payment_status, $orderData)
+ {
+ return Db::getInstance()->execute(
+ 'UPDATE `'._DB_PREFIX_.'wk_paypal_commerce_order`
+ SET `pp_payment_status` = "'.pSQL($payment_status).'",
+ `response` = "'.pSQL(json_encode($orderData)).'"
+ WHERE `pp_transaction_id` = "'.pSQL($transaction_id).'"
+ '
+ );
+ }
+
/**
* Get currency formatted price
* @param float $price
diff --git a/modules/qlopaypalcommerce/classes/WkPaypalCommerceDb.php b/modules/qlopaypalcommerce/classes/WkPaypalCommerceDb.php
index 1bf8df69e..19a2225ac 100644
--- a/modules/qlopaypalcommerce/classes/WkPaypalCommerceDb.php
+++ b/modules/qlopaypalcommerce/classes/WkPaypalCommerceDb.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
class WkPaypalCommerceDb
@@ -85,6 +85,14 @@ class WkPaypalCommerceDb
'WK_PAYPAL_COMMERCE_EMAIL',
'WK_PAYPAL_COMMERCE_CLIENT_ID',
'WK_PAYPAL_COMMERCE_CLIENT_SECRET',
+ 'WK_PAYPAL_COMMERCE_SANDBOX_MERCHANT_ID',
+ 'WK_PAYPAL_COMMERCE_SANDBOX_EMAIL',
+ 'WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID',
+ 'WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_SECRET',
+ 'WK_PAYPAL_COMMERCE_LIVE_MERCHANT_ID',
+ 'WK_PAYPAL_COMMERCE_LIVE_EMAIL',
+ 'WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID',
+ 'WK_PAYPAL_COMMERCE_LIVE_CLIENT_SECRET',
'WK_PAYPAL_COMMERCE_PAYMENT_MODE',
'WK_PAYPAL_COMMERCE_SANDBOX_WEBHOOK_ID',
'WK_PAYPAL_COMMERCE_LIVE_WEBHOOK_ID',
@@ -111,21 +119,37 @@ class WkPaypalCommerceDb
public function getConfigFieldsValues()
{
return array(
- 'WK_PAYPAL_COMMERCE_MERCHANT_ID' => Tools::getValue(
- 'WK_PAYPAL_COMMERCE_MERCHANT_ID',
- Configuration::get('WK_PAYPAL_COMMERCE_MERCHANT_ID')
+ 'WK_PAYPAL_COMMERCE_SANDBOX_MERCHANT_ID' => Tools::getValue(
+ 'WK_PAYPAL_COMMERCE_SANDBOX_MERCHANT_ID',
+ Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_MERCHANT_ID')
),
- 'WK_PAYPAL_COMMERCE_EMAIL' => Tools::getValue(
- 'WK_PAYPAL_COMMERCE_EMAIL',
- Configuration::get('WK_PAYPAL_COMMERCE_EMAIL')
+ 'WK_PAYPAL_COMMERCE_SANDBOX_EMAIL' => Tools::getValue(
+ 'WK_PAYPAL_COMMERCE_SANDBOX_EMAIL',
+ Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_EMAIL')
),
- 'WK_PAYPAL_COMMERCE_CLIENT_ID' => Tools::getValue(
- 'WK_PAYPAL_COMMERCE_CLIENT_ID',
- Configuration::get('WK_PAYPAL_COMMERCE_CLIENT_ID')
+ 'WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID' => Tools::getValue(
+ 'WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID',
+ Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID')
),
- 'WK_PAYPAL_COMMERCE_CLIENT_SECRET' => Tools::getValue(
- 'WK_PAYPAL_COMMERCE_CLIENT_SECRET',
- Configuration::get('WK_PAYPAL_COMMERCE_CLIENT_SECRET')
+ 'WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_SECRET' => Tools::getValue(
+ 'WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_SECRET',
+ Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_SECRET')
+ ),
+ 'WK_PAYPAL_COMMERCE_LIVE_MERCHANT_ID' => Tools::getValue(
+ 'WK_PAYPAL_COMMERCE_LIVE_MERCHANT_ID',
+ Configuration::get('WK_PAYPAL_COMMERCE_LIVE_MERCHANT_ID')
+ ),
+ 'WK_PAYPAL_COMMERCE_LIVE_EMAIL' => Tools::getValue(
+ 'WK_PAYPAL_COMMERCE_LIVE_EMAIL',
+ Configuration::get('WK_PAYPAL_COMMERCE_LIVE_EMAIL')
+ ),
+ 'WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID' => Tools::getValue(
+ 'WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID',
+ Configuration::get('WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID')
+ ),
+ 'WK_PAYPAL_COMMERCE_LIVE_CLIENT_SECRET' => Tools::getValue(
+ 'WK_PAYPAL_COMMERCE_LIVE_CLIENT_SECRET',
+ Configuration::get('WK_PAYPAL_COMMERCE_LIVE_CLIENT_SECRET')
),
'WK_PAYPAL_COMMERCE_PAYMENT_MODE' => Tools::getValue(
'WK_PAYPAL_COMMERCE_PAYMENT_MODE',
diff --git a/modules/qlopaypalcommerce/classes/WkPaypalCommerceHelper.php b/modules/qlopaypalcommerce/classes/WkPaypalCommerceHelper.php
index cc0ee0129..3ce60de35 100644
--- a/modules/qlopaypalcommerce/classes/WkPaypalCommerceHelper.php
+++ b/modules/qlopaypalcommerce/classes/WkPaypalCommerceHelper.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
class WkPaypalCommerceHelper
@@ -27,14 +27,24 @@ class WkPaypalCommerceHelper
public static function getAccessToken()
{
$apiResp = array();
- if (Tools::isSubmit('submit_paypal_commerce')) {
- $wkClientID = trim(Tools::getValue('WK_PAYPAL_COMMERCE_CLIENT_ID'));
- $wkClientSecret = trim(Tools::getValue('WK_PAYPAL_COMMERCE_CLIENT_SECRET'));
+ if (Tools::isSubmit('btnConfigSubmit')) {
$wkEnvironment = Tools::getValue('WK_PAYPAL_COMMERCE_PAYMENT_MODE');
+ if ($wkEnvironment == QloPaypalCommerce::WK_PAYPAL_COMMERCE_PAYMENT_MODE_PRODUCTION) {
+ $wkClientID = trim(Tools::getValue('WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID'));
+ $wkClientSecret = trim(Tools::getValue('WK_PAYPAL_COMMERCE_LIVE_CLIENT_SECRET'));
+ } else {
+ $wkClientID = trim(Tools::getValue('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID'));
+ $wkClientSecret = trim(Tools::getValue('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_SECRET'));
+ }
} else {
- $wkClientID = trim(Configuration::get('WK_PAYPAL_COMMERCE_CLIENT_ID'));
- $wkClientSecret = trim(Configuration::get('WK_PAYPAL_COMMERCE_CLIENT_SECRET'));
$wkEnvironment = Configuration::get('WK_PAYPAL_COMMERCE_PAYMENT_MODE');
+ if ($wkEnvironment == QloPaypalCommerce::WK_PAYPAL_COMMERCE_PAYMENT_MODE_PRODUCTION) {
+ $wkClientID = Configuration::get('WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID');
+ $wkClientSecret = Configuration::get('WK_PAYPAL_COMMERCE_LIVE_CLIENT_SECRET');
+ } else {
+ $wkClientID = Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID');
+ $wkClientSecret = Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_SECRET');
+ }
}
$base_url = ($wkEnvironment == 'sandbox') ? PayPalHelper::WK_PAYPAL_SANDBOX_URL : PayPalHelper::WK_PAYPAL_LIVE_URL;
@@ -60,8 +70,6 @@ class WkPaypalCommerceHelper
$response = curl_exec($curl);
$err = curl_error($curl);
- curl_close($curl);
-
if ($err) {
throw new PrestaShopException(sprintf('cURL Error #: %s', $err));
} else {
@@ -84,9 +92,19 @@ class WkPaypalCommerceHelper
"alg" => "none"
);
$returnData = base64_encode(json_encode($temp)) . '.';
+
+ $wkEnvironment = Configuration::get('WK_PAYPAL_COMMERCE_PAYMENT_MODE');
+ if ($wkEnvironment == QloPaypalCommerce::WK_PAYPAL_COMMERCE_PAYMENT_MODE_PRODUCTION) {
+ $wkClientID = Configuration::get('WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID');
+ $wkMerchantID = Configuration::get('WK_PAYPAL_COMMERCE_LIVE_MERCHANT_ID');
+ } else {
+ $wkClientID = Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID');
+ $wkMerchantID = Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_MERCHANT_ID');
+ }
+
$temp = array(
- "iss" => trim(Configuration::get('WK_PAYPAL_COMMERCE_CLIENT_ID')),
- "payer_id" => Configuration::get('WK_PAYPAL_COMMERCE_MERCHANT_ID')
+ "iss" => $wkClientID,
+ "payer_id" => $wkMerchantID
);
$returnData .= base64_encode(json_encode($temp)) . '.';
return $returnData;
@@ -156,7 +174,6 @@ class WkPaypalCommerceHelper
$response = curl_exec($curl);
$err = curl_error($curl);
- curl_close($curl);
if ($err) {
throw new PrestaShopException(sprintf('cURL Error #: %s', $err));
@@ -215,8 +232,6 @@ class WkPaypalCommerceHelper
curl_exec($curl);
$err = curl_error($curl);
- curl_close($curl);
-
if ($err) {
throw new PrestaShopException(sprintf('cURL Error #: %s', $err));
}
@@ -255,8 +270,6 @@ class WkPaypalCommerceHelper
$response = curl_exec($curl);
$err = curl_error($curl);
- curl_close($curl);
-
if ($err) {
throw new PrestaShopException(sprintf('cURL Error #: %s', $err));
} else {
@@ -415,30 +428,6 @@ class WkPaypalCommerceHelper
}
}
}
-
- $items = array_values($items);
- $itemKey = count($items);
-
- if ($totalFacilityCostTE = $objCartBookingData->getCartExtraDemands($objCart->id, 0, 0, 0, 0, 1, 0, 0)) {
- $totalFacilityCostTI = $objCartBookingData->getCartExtraDemands($objCart->id, 0, 0, 0, 0, 1, 0, 1);
- $items[$itemKey]['name'] = 'Extra facilities';
- // $items[$itemKey]['sku'] = $product['reference'];
- $items[$itemKey]['category'] = 'DIGITAL_GOODS';
-
- $items[$itemKey]['description'] = 'Price of all Extra facilities added to the bookings';
-
- // unit amount
- $items[$itemKey]['unit_amount']['value'] = Tools::ps_round($totalFacilityCostTE, 2);
- $items[$itemKey]['unit_amount']['currency_code'] = $currency['iso_code'];
-
- // tax values
- $tax = $totalFacilityCostTI - $totalFacilityCostTE;
- $items[$itemKey]['tax']['value'] = Tools::ps_round($tax, 2);
- $items[$itemKey]['tax']['currency_code'] = $currency['iso_code'];
-
- // quantity
- $items[$itemKey]['quantity'] = 1;
- }
}
return $items;
diff --git a/modules/qlopaypalcommerce/classes/WkPaypalCommerceRefund.php b/modules/qlopaypalcommerce/classes/WkPaypalCommerceRefund.php
index 1a0a47bc8..b92c45513 100644
--- a/modules/qlopaypalcommerce/classes/WkPaypalCommerceRefund.php
+++ b/modules/qlopaypalcommerce/classes/WkPaypalCommerceRefund.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
class WkPaypalCommerceRefund extends ObjectModel
@@ -83,6 +83,14 @@ class WkPaypalCommerceRefund extends ObjectModel
)
);
+ public static function getIdByPaypalRefundId($paypalRefundId)
+ {
+ return Db::getInstance()->getValue(
+ 'SELECT `id_paypal_commerce_refund` FROM `'._DB_PREFIX_.'wk_paypal_commerce_refund`
+ WHERE `paypal_refund_id` = "'.pSQL($paypalRefundId).'"'
+ );
+ }
+
public static function getRefundListByTransID($idTrans)
{
$refunds = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(
diff --git a/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php b/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php
index 4a6833f40..d0031aafe 100644
--- a/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php
+++ b/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,21 +18,26 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
class WkPaypalCommerceWebhook
{
+ const WK_PAYPAL_COMMERCE_PAYMENT_STATUS_COMPLETED = 'COMPLETED';
+ const WK_PAYPAL_COMMERCE_PAYMENT_STATUS_APPROVED = 'APPROVED';
+ const WK_PAYPAL_COMMERCE_PAYMENT_STATUS_PENDING = 'PENDING';
+ const WK_PAYPAL_COMMERCE_PAYMENT_STATUS_DENIED = 'DENIED';
+ const WK_PAYPAL_COMMERCE_EVENT_TYPE_ORDER_COMPLETED = 'CHECKOUT.ORDER.COMPLETED';
+
public function capturePending($eventData)
{
$transaction_id = $eventData['resource']['id'];
- $objPaypalOrder = new WKPayPalCommerceOrder();
- if ($objPaypalOrder->getTransactionDetailsByPaypalTransaction(
+ if (WKPayPalCommerceOrder::getTransactionDetailsByPaypalTransaction(
$transaction_id
)) {
$ppOrderStatus = $eventData['resource']['status'];
- $this->updateOrderCapturePaypalOrderStatus($transaction_id, $ppOrderStatus);
+ WKPayPalCommerceOrder::updateOrderCapturePaypalOrderStatus($transaction_id, $ppOrderStatus);
}
}
@@ -40,10 +45,7 @@ class WkPaypalCommerceWebhook
{
$refundID = $eventData['resource']['id'];
- $id = Db::getInstance()->getValue(
- 'SELECT `id_paypal_commerce_refund` FROM `'._DB_PREFIX_.'wk_paypal_commerce_refund`
- WHERE `paypal_refund_id` = "' . pSQL($refundID) .'"'
- );
+ $id = WkPaypalCommerceRefund::getIdByPaypalRefundId($refundID);
$refundObj = new WkPaypalCommerceRefund($id);
$refundObj->paypal_refund_id = $refundID;
@@ -60,8 +62,7 @@ class WkPaypalCommerceWebhook
public function captureDenied($eventData)
{
$transaction_id = $eventData['resource']['id'];
- $objPaypalOrder = new WKPayPalCommerceOrder();
- if ($transactionData = $objPaypalOrder->getTransactionDetailsByPaypalTransaction(
+ if ($transactionData = WKPayPalCommerceOrder::getTransactionDetailsByPaypalTransaction(
$transaction_id
)) {
$cartID = $transactionData['id_cart'];
@@ -76,7 +77,7 @@ class WkPaypalCommerceWebhook
}
$ppOrderStatus = $eventData['resource']['status'];
- $this->updateOrderCapturePaypalOrderStatus($transaction_id, $ppOrderStatus);
+ WKPayPalCommerceOrder::updateOrderCapturePaypalOrderStatus($transaction_id, $ppOrderStatus);
}
}
@@ -87,21 +88,33 @@ class WkPaypalCommerceWebhook
foreach ($purchaseUnits as $purchase) {
$transaction_id = $purchase['payments']['captures'][0]['id'];
- $objPaypalOrder = new WKPayPalCommerceOrder();
- if ($transactionData = $objPaypalOrder->getTransactionDetailsByPaypalTransaction(
+ if ($transactionData = WKPayPalCommerceOrder::getTransactionDetailsByPaypalTransaction(
$transaction_id
)) {
// Check if PayPal order is already finished with status COMPLETED
- if ($transactionData['pp_payment_status'] != 'COMPLETED') {
+ if ($transactionData['pp_payment_status'] != self::WK_PAYPAL_COMMERCE_PAYMENT_STATUS_COMPLETED) {
// if order completed then change the status of the order
- if ($eventData['event_type'] == 'CHECKOUT.ORDER.COMPLETED') {
+ if ($eventData['event_type'] == self::WK_PAYPAL_COMMERCE_EVENT_TYPE_ORDER_COMPLETED) {
$cartID = $transactionData['id_cart'];
$objCart = new Cart($cartID);
- if ($objCart->is_advance_payment) {
- $orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
- } else {
- $orderStatus = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
+ $capturedAmount = isset($purchase['payments']['captures'][0]['amount']['value'])
+ ? (float)$purchase['payments']['captures'][0]['amount']['value']
+ : 0;
+ $capturedCurrency = isset($purchase['payments']['captures'][0]['amount']['currency_code'])
+ ? $purchase['payments']['captures'][0]['amount']['currency_code']
+ : '';
+ $cartCurrency = Currency::getCurrency((int)$objCart->id_currency);
+ if (Tools::strtoupper($capturedCurrency) !== Tools::strtoupper($cartCurrency['iso_code'])) {
+ WkPaypalCommerceHelper::logMsg(
+ 'webhook',
+ 'PayPal currency mismatch for cart '.(int)$cartID.'. Captured currency: '.$capturedCurrency
+ );
+ continue;
}
+ $fullTotal = (float)$objCart->getOrderTotal(true, Cart::BOTH);
+ $orderStatus = $capturedAmount >= $fullTotal
+ ? Configuration::get('PS_OS_PAYMENT_ACCEPTED')
+ : Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
if ($orders = WkPaypalCommerceHelper::getOrdersByCartId($cartID)) {
foreach ($orders as $order) {
$this->updatePaymentStatus(
@@ -113,7 +126,7 @@ class WkPaypalCommerceWebhook
}
}
- $this->updateOrderPaypalOrderStatus($transaction_id, $payment_status, $eventData['resource']);
+ WKPayPalCommerceOrder::updateOrderPaypalOrderStatus($transaction_id, $payment_status, $eventData['resource']);
}
}
}
@@ -121,17 +134,29 @@ class WkPaypalCommerceWebhook
public function captureCompleted($eventData)
{
$transaction_id = $eventData['resource']['id'];
- $objPaypalOrder = new WKPayPalCommerceOrder();
- if ($transactionData = $objPaypalOrder->getTransactionDetailsByPaypalTransaction(
+ if ($transactionData = WKPayPalCommerceOrder::getTransactionDetailsByPaypalTransaction(
$transaction_id
)) {
$cartID = $transactionData['id_cart'];
$objCart = new Cart($cartID);
- if ($objCart->is_advance_payment) {
- $orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
- } else {
- $orderStatus = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
+ $capturedAmount = isset($eventData['resource']['amount']['value'])
+ ? (float)$eventData['resource']['amount']['value']
+ : 0;
+ $capturedCurrency = isset($eventData['resource']['amount']['currency_code'])
+ ? $eventData['resource']['amount']['currency_code']
+ : '';
+ $cartCurrency = Currency::getCurrency((int)$objCart->id_currency);
+ if (Tools::strtoupper($capturedCurrency) !== Tools::strtoupper($cartCurrency['iso_code'])) {
+ WkPaypalCommerceHelper::logMsg(
+ 'webhook',
+ 'PayPal currency mismatch for cart '.(int)$cartID.'. Captured currency: '.$capturedCurrency
+ );
+ return;
}
+ $fullTotal = (float)$objCart->getOrderTotal(true, Cart::BOTH);
+ $orderStatus = $capturedAmount >= $fullTotal
+ ? Configuration::get('PS_OS_PAYMENT_ACCEPTED')
+ : Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
if ($orders = WkPaypalCommerceHelper::getOrdersByCartId($cartID)) {
foreach ($orders as $order) {
$this->updatePaymentStatus(
@@ -142,7 +167,7 @@ class WkPaypalCommerceWebhook
}
$ppOrderStatus = $eventData['resource']['status'];
- $this->updateOrderCapturePaypalOrderStatus($transaction_id, $ppOrderStatus);
+ WKPayPalCommerceOrder::updateOrderCapturePaypalOrderStatus($transaction_id, $ppOrderStatus);
}
}
@@ -172,25 +197,4 @@ class WkPaypalCommerceWebhook
$orderHistory->addWithemail(true, null);
}
}
-
- public function updateOrderCapturePaypalOrderStatus($transaction_id, $payment_status)
- {
- return Db::getInstance()->execute(
- 'UPDATE `'._DB_PREFIX_.'wk_paypal_commerce_order`
- SET `pp_payment_status` = "'.pSQL($payment_status).'"
- WHERE `pp_transaction_id` = "'.pSQL($transaction_id).'"
- '
- );
- }
-
- public function updateOrderPaypalOrderStatus($transaction_id, $payment_status, $orderData)
- {
- return Db::getInstance()->execute(
- 'UPDATE `'._DB_PREFIX_.'wk_paypal_commerce_order`
- SET `pp_payment_status` = "'.pSQL($payment_status).'",
- `response` = "'.pSQL(json_encode($orderData)).'"
- WHERE `pp_transaction_id` = "'.pSQL($transaction_id).'"
- '
- );
- }
}
diff --git a/modules/qlopaypalcommerce/classes/index.php b/modules/qlopaypalcommerce/classes/index.php
index 409280877..8d30901e6 100644
--- a/modules/qlopaypalcommerce/classes/index.php
+++ b/modules/qlopaypalcommerce/classes/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
diff --git a/modules/qlopaypalcommerce/controllers/admin/AdminPaypalCommerceTransactionController.php b/modules/qlopaypalcommerce/controllers/admin/AdminPaypalCommerceTransactionController.php
index 3e8a23b17..2c8412c10 100644
--- a/modules/qlopaypalcommerce/controllers/admin/AdminPaypalCommerceTransactionController.php
+++ b/modules/qlopaypalcommerce/controllers/admin/AdminPaypalCommerceTransactionController.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
class AdminPaypalCommerceTransactionController extends ModuleAdminController
@@ -30,16 +30,36 @@ class AdminPaypalCommerceTransactionController extends ModuleAdminController
$this->bootstrap = true;
$this->list_no_link = true;
+ $this->_new_list_header_design = true;
$this->table = 'wk_paypal_commerce_order';
$this->className = 'WKPayPalCommerceOrder';
- $this->_select = 'a.*, CONCAT(c.firstname, \' \', c.lastname) as customer_name, c.email';
+ $this->_select = 'a.*, CONCAT(c.firstname, \' \', c.lastname) as customer_name, c.email,
+ CONCAT("[", GROUP_CONCAT(DISTINCT ord.`id_order`), "]") as id_orders';
+
$this->_join = ' LEFT JOIN `' . _DB_PREFIX_ . 'customer` c ON (c.id_customer = a.id_customer)';
+ $this->_join .= ' LEFT JOIN `' . _DB_PREFIX_ . 'orders` ord ON (a.`order_reference` = ord.`reference`)';
$this->_where = ' AND a.`id_cart` != 0';
$this->_orderBy = 'id_paypal_commerce_order';
$this->_defaultOrderWay = 'DESC';
+ $this->_group = ' GROUP BY a.`id_cart`';
+
+ $orderBy = Tools::getValue($this->table.'Orderby');
+ $orderWay = Tools::getValue($this->table.'Orderway');
+
+ if (!Validate::isOrderBy($orderBy)) {
+ $orderBy = 'id_paypal_commerce_order'; // fallback
+ }
+
+ if (!Validate::isOrderWay($orderWay)) {
+ $orderWay = 'DESC';
+ }
+
+ $this->_orderBy = pSQL($orderBy);
+ $this->_orderWay = pSQL($orderWay);
+
$this->toolbar_title = $this->l('PayPal Transactions');
$this->fields_list = array(
@@ -47,6 +67,7 @@ class AdminPaypalCommerceTransactionController extends ModuleAdminController
'title' => $this->l('Order Reference'),
'align' => 'center',
'havingFilter' => true,
+ 'callback' => 'getOrderInfo',
'hint' => $this->l('Order reference in QloApps of the PayPal transaction'),
),
'pp_transaction_id' => array(
@@ -80,6 +101,8 @@ class AdminPaypalCommerceTransactionController extends ModuleAdminController
'hint' => $this->l('Payment Status'),
'orderBy' => false,
'hint' => $this->l('Current status of the PayPal transaction.'),
+ 'callback' => 'getStatus',
+ 'search' => false,
),
'order_date' => array(
'title' => $this->l('Order Date'),
@@ -92,7 +115,61 @@ class AdminPaypalCommerceTransactionController extends ModuleAdminController
public function getCustomerInfo($customerName, $row)
{
- return ''.$customerName.' '.'('.$row['email'].')';
+ $safeCustomerName = Tools::safeOutput($customerName);
+ $safeEmail = Tools::safeOutput($row['email']);
+ return ''.$safeCustomerName.' '.'('.$safeEmail.')';
+ }
+
+ public function getOrderInfo($reference, $row)
+ {
+ $safeReference = Tools::safeOutput($reference);
+ $str = $safeReference.' (';
+ $arrIdOrders = json_decode($row['id_orders']);
+ if (is_array($arrIdOrders)) {
+ $arrIdOrders = array_values(array_unique(array_map('intval', $arrIdOrders)));
+ foreach ($arrIdOrders as $key => $id_order) {
+ $str .= '#'.$id_order.'';
+ if ($key < count($arrIdOrders) - 1) {
+ $str .= ', ';
+ }
+ }
+ }
+ return $str.')';
+ }
+
+ /**
+ * Renders the "Status" list column as a colored badge for known PayPal
+ * payment statuses, falling back to plain escaped text for any other value.
+ * @param string $ppPaymentStatus Raw PayPal payment status stored on the transaction
+ * @return string HTML for the list cell
+ */
+ public function getStatus($ppPaymentStatus)
+ {
+ $statusBadges = array(
+ WkPaypalCommerceWebhook::WK_PAYPAL_COMMERCE_PAYMENT_STATUS_COMPLETED => array(
+ 'class' => 'badge-success',
+ 'label' => $this->l('Completed'),
+ ),
+ WkPaypalCommerceWebhook::WK_PAYPAL_COMMERCE_PAYMENT_STATUS_APPROVED => array(
+ 'class' => 'badge-info',
+ 'label' => $this->l('Approved'),
+ ),
+ WkPaypalCommerceWebhook::WK_PAYPAL_COMMERCE_PAYMENT_STATUS_PENDING => array(
+ 'class' => 'badge-warning',
+ 'label' => $this->l('Pending'),
+ ),
+ WkPaypalCommerceWebhook::WK_PAYPAL_COMMERCE_PAYMENT_STATUS_DENIED => array(
+ 'class' => 'badge-danger',
+ 'label' => $this->l('Denied'),
+ ),
+ );
+
+ if (isset($statusBadges[$ppPaymentStatus])) {
+ return ''
+ .$statusBadges[$ppPaymentStatus]['label'].'';
+ }
+
+ return Tools::safeOutput($ppPaymentStatus);
}
public function setCurrency($val, $row)
@@ -133,47 +210,57 @@ class AdminPaypalCommerceTransactionController extends ModuleAdminController
public function renderView()
{
$idTrans = (int)Tools::getValue('id_paypal_commerce_order');
- if ($idTrans > 0) {
+ $objPPOrder = new WKPayPalCommerceOrder($idTrans);
+ if (Validate::isLoadedObject($objPPOrder)) {
$smartyVars = array();
$refundData = array();
$totalRefunded = 0;
- if ($transactionData = WKPayPalCommerceOrder::getTransactionDetails((int)$idTrans)) {
- $orderCurrency = new Currency((int)$transactionData['id_currency']);
- $refundData = WkPaypalCommerceRefund::getRefundListByTransID((int)$idTrans);
- $totalRefundedFormatted = WkPaypalCommerceRefund::getTotalRefundedAmount((int)$idTrans, true);
+ $transactionData = WKPayPalCommerceOrder::getTransactionDetails((int)$idTrans);
+ $orderCurrency = new Currency((int)$transactionData['id_currency']);
+ $refundData = WkPaypalCommerceRefund::getRefundListByTransID((int)$idTrans);
+ $totalRefundedFormatted = WkPaypalCommerceRefund::getTotalRefundedAmount((int)$idTrans, true);
- $totalRefunded = WkPaypalCommerceRefund::getTotalRefundedAmount((int)$idTrans, false);
- $remainingRefund = (float)($transactionData['pp_paid_total'] - $totalRefunded);
- $response = Tools::jsonDecode($transactionData['response'], true);
+ $totalRefunded = WkPaypalCommerceRefund::getTotalRefundedAmount((int)$idTrans, false);
+ $remainingRefund = (float)($transactionData['pp_paid_total'] - $totalRefunded);
+ $response = json_decode($transactionData['response'], true);
- // Buyer making a payment in a different currency (ex: EUR) which is different from the default currency of merchant (Ex: USD), In all those cross currency cases, After Capture, transaction will fall into Pending state and will require merchant to manually go to his PayPal account and accept the payment.
- $objPPOrder = new WKPayPalCommerceOrder();
- if (
- isset($response['data']['purchase_units'][0]['payments']['captures'][0]['status_details']['reason'])
- && ($transactionData['pp_payment_status'] == 'PENDING' || $transactionData['pp_payment_status'] == 'DENIED')
- && isset($response['data']['purchase_units'][0]['payments']['captures'][0]['status_details']['reason'])
- ) {
- if (isset($objPPOrder->ppStatusDetail[$response['data']['purchase_units'][0]['payments']['captures'][0]['status_details']['reason']])) {
- $smartyVars['ppstatusDetailMsg'] = $objPPOrder->ppStatusDetail[$response['data']['purchase_units'][0]['payments']['captures'][0]['status_details']['reason']];
- }
+ // Buyer making a payment in a different currency (ex: EUR) which is different from the default currency of merchant (Ex: USD), In all those cross currency cases, After Capture, transaction will fall into Pending state and will require merchant to manually go to his PayPal account and accept the payment.
+ if (isset($response['data']['purchase_units'][0]['payments']['captures'][0]['status_details']['reason'])
+ && ($transactionData['pp_payment_status'] == WkPaypalCommerceWebhook::WK_PAYPAL_COMMERCE_PAYMENT_STATUS_PENDING
+ || $transactionData['pp_payment_status'] == WkPaypalCommerceWebhook::WK_PAYPAL_COMMERCE_PAYMENT_STATUS_DENIED)
+ ) {
+ if (isset($objPPOrder->ppStatusDetail[$response['data']['purchase_units'][0]['payments']['captures'][0]['status_details']['reason']])) {
+ $smartyVars['ppstatusDetailMsg'] = $objPPOrder->ppStatusDetail[$response['data']['purchase_units'][0]['payments']['captures'][0]['status_details']['reason']];
}
-
- $smartyVars['transaction_url'] = $this->context->link->getAdminLink('AdminPaypalCommerceTransaction',Tools::getAdminTokenLite('AdminPaypalCommerceTransaction')).'&viewwk_paypal_commerce_order&id_paypal_commerce_order=' . (int)$idTrans;
- $smartyVars['transaction_data'] = $transactionData;
- $smartyVars['refund_data'] = $refundData;
- $smartyVars['refunded_amount'] = $totalRefundedFormatted;
- $smartyVars['remaining_refund'] = $remainingRefund;
- $smartyVars['remaining_refund_format'] = Tools::displayPrice($remainingRefund, $orderCurrency);
- $smartyVars['currency'] = $orderCurrency;
- $smartyVars['WK_PAYPAL_COMMERCE_REFUND_TYPE_FULL'] = WkPaypalCommerceRefund::WK_PAYPAL_COMMERCE_REFUND_TYPE_FULL;
- $smartyVars['WK_PAYPAL_COMMERCE_REFUND_TYPE_PARTIAL'] = WkPaypalCommerceRefund::WK_PAYPAL_COMMERCE_REFUND_TYPE_PARTIAL;
-
- $this->context->smarty->assign($smartyVars);
- $this->base_tpl_view = 'view.tpl';
- return parent::renderView();
- } else {
- Tools::redirectAdmin(self::$currentIndex . '&token=' . $this->token);
}
+
+ $orderLinks = array();
+ if ($transactionData['id_cart']) {
+ $orders = Order::getByReference($transactionData['order_reference']);
+ foreach ($orders as $order) {
+ $orderLinks[] = array(
+ 'id_order' => (int) $order->id,
+ 'link' => $this->context->link->getAdminLink('AdminOrders')
+ . '&id_order=' . (int) $order->id
+ . '&vieworder',
+ );
+ }
+ }
+
+ $smartyVars['transaction_data'] = $transactionData;
+ $smartyVars['order_links'] = $orderLinks;
+ $smartyVars['refund_data'] = $refundData;
+ $smartyVars['refunded_amount'] = $totalRefundedFormatted;
+ $smartyVars['remaining_refund'] = $remainingRefund;
+ $smartyVars['remaining_refund_format'] = Tools::displayPrice($remainingRefund, $orderCurrency);
+ $smartyVars['currency'] = $orderCurrency;
+ $smartyVars['WK_PAYPAL_COMMERCE_REFUND_TYPE_FULL'] = WkPaypalCommerceRefund::WK_PAYPAL_COMMERCE_REFUND_TYPE_FULL;
+ $smartyVars['WK_PAYPAL_COMMERCE_REFUND_TYPE_PARTIAL'] = WkPaypalCommerceRefund::WK_PAYPAL_COMMERCE_REFUND_TYPE_PARTIAL;
+ $smartyVars['WK_PAYPAL_COMMERCE_PAYMENT_STATUS_COMPLETED'] = WkPaypalCommerceWebhook::WK_PAYPAL_COMMERCE_PAYMENT_STATUS_COMPLETED;
+
+ $this->context->smarty->assign($smartyVars);
+ $this->base_tpl_view = 'view.tpl';
+ return parent::renderView();
} else {
Tools::redirectAdmin(self::$currentIndex . '&token=' . $this->token);
}
@@ -225,7 +312,7 @@ class AdminPaypalCommerceTransactionController extends ModuleAdminController
$postData = array();
$postData['amount'] = array(
'currency_code' => $transactionData['pp_paid_currency'],
- 'value' => $refundAmt
+ 'value' => number_format(Tools::ps_round($refundAmt, 2), 2, '.', '')
);
$postData['transaction_id'] = $transactionData['pp_transaction_id'];
$postData['refund_reason'] = $refundReason;
diff --git a/modules/qlopaypalcommerce/controllers/admin/index.php b/modules/qlopaypalcommerce/controllers/admin/index.php
index 409280877..8d30901e6 100644
--- a/modules/qlopaypalcommerce/controllers/admin/index.php
+++ b/modules/qlopaypalcommerce/controllers/admin/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
diff --git a/modules/qlopaypalcommerce/controllers/front/callback.php b/modules/qlopaypalcommerce/controllers/front/callback.php
index 89aac427d..f408f90db 100644
--- a/modules/qlopaypalcommerce/controllers/front/callback.php
+++ b/modules/qlopaypalcommerce/controllers/front/callback.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
class QloPaypalCommerceCallbackModuleFrontController extends ModuleFrontController
diff --git a/modules/qlopaypalcommerce/controllers/front/errorpayment.php b/modules/qlopaypalcommerce/controllers/front/errorpayment.php
index a54ab7adf..657e701c7 100644
--- a/modules/qlopaypalcommerce/controllers/front/errorpayment.php
+++ b/modules/qlopaypalcommerce/controllers/front/errorpayment.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
class QloPaypalCommerceErrorpaymentModuleFrontController extends ModuleFrontController
diff --git a/modules/qlopaypalcommerce/controllers/front/index.php b/modules/qlopaypalcommerce/controllers/front/index.php
index 409280877..8d30901e6 100644
--- a/modules/qlopaypalcommerce/controllers/front/index.php
+++ b/modules/qlopaypalcommerce/controllers/front/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
diff --git a/modules/qlopaypalcommerce/controllers/front/payment.php b/modules/qlopaypalcommerce/controllers/front/payment.php
index 3795a5e75..a2b4ecf93 100644
--- a/modules/qlopaypalcommerce/controllers/front/payment.php
+++ b/modules/qlopaypalcommerce/controllers/front/payment.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,11 +18,15 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontController
{
+ const WK_PAYPAL_COMMERCE_ACTION_CREATE_ORDER = 1;
+ const WK_PAYPAL_COMMERCE_ACTION_CAPTURE_ORDER = 2;
+ const WK_PAYPAL_COMMERCE_ACTION_CANCELLED = 3;
+
public function init()
{
parent::init();
@@ -61,13 +65,13 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
parent::initContent();
if ($this->module->secure_key != Tools::getValue('token')) {
- die('Invalid token.');
+ die($this->module->l('Invalid token.', 'payment'));
}
if (Tools::isSubmit('action')) {
$action = (int)Tools::getValue('action');
switch ($action) {
- case 1:
+ case self::WK_PAYPAL_COMMERCE_ACTION_CREATE_ORDER:
$json = Tools::file_get_contents('php://input');
$orderDetails = json_decode($json, true);
@@ -94,7 +98,7 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
WkPaypalCommerceHelper::logMsg('payment', json_encode($ppOrderData));
die(json_encode($ppOrderData));
- case 2:
+ case self::WK_PAYPAL_COMMERCE_ACTION_CAPTURE_ORDER:
$json = Tools::file_get_contents('php://input');
$orderData = json_decode($json, true);
@@ -122,34 +126,70 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
// Payment success
$paypalOrderID = $returnData['data']['id'];
- // Save order data
- $transaction_id = $this->saveOrderData($returnData);
- if ($paypalOrderID) {
- $currency = $this->context->currency;
- $total = (float)$cart->getOrderTotal(true, Cart::BOTH);
- if ($cart->is_advance_payment) {
- $total = (float)$cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT);
- } else {
- $total = (float)$cart->getOrderTotal(true, Cart::BOTH);
+ $paymentStatus = '';
+
+ if (isset($returnData['data']['purchase_units'][0]['payments']['captures'][0]['status'])) {
+ $paymentStatus = $returnData['data']['purchase_units'][0]['payments']['captures'][0]['status'];
+ }
+
+ $paypalOrderCartId = isset($returnData['data']['purchase_units'][0]['custom_id']) ? $returnData['data']['purchase_units'][0]['custom_id'] : null;
+ $belongsToCurrentCart = ((int) $paypalOrderCartId === (int) $cart->id);
+
+ // captured currency must match the cart currency, otherwise the captured amount cannot be compared with the cart total
+ $capturedCurrency = isset($returnData['data']['purchase_units'][0]['payments']['captures'][0]['amount']['currency_code']) ?
+ $returnData['data']['purchase_units'][0]['payments']['captures'][0]['amount']['currency_code'] : '';
+ // payment is deducted in the captured currency, so order must be created in that currency
+ if ($capturedCurrency && $paymentStatus == WkPaypalCommerceWebhook::WK_PAYPAL_COMMERCE_PAYMENT_STATUS_COMPLETED && $belongsToCurrentCart) {
+ $cartCurrency = Currency::getCurrency((int) $cart->id_currency);
+ if (Tools::strtoupper($capturedCurrency) !== Tools::strtoupper($cartCurrency['iso_code'])) {
+ $idCapturedCurrency = (int) Currency::getIdByIsoCode($capturedCurrency);
+ $objCapturedCurrency = new Currency($idCapturedCurrency);
+ if (Validate::isLoadedObject($objCapturedCurrency) && $objCapturedCurrency->active && !$objCapturedCurrency->deleted) {
+ WkPaypalCommerceHelper::logMsg(
+ 'payment',
+ 'Switching cart currency from '.$cartCurrency['iso_code'].' to PayPal captured currency '.$capturedCurrency
+ );
+ $cart->id_currency = $idCapturedCurrency;
+ $cart->update();
+ $this->context->currency = $objCapturedCurrency;
+ $this->context->cart = $cart;
+ }
}
+ }
+ $cartCurrency = Currency::getCurrency((int) $cart->id_currency);
+ $currencyMatches = (Tools::strtoupper($capturedCurrency) === Tools::strtoupper($cartCurrency['iso_code']));
+
+ if ($paypalOrderID && $paymentStatus == WkPaypalCommerceWebhook::WK_PAYPAL_COMMERCE_PAYMENT_STATUS_COMPLETED && $belongsToCurrentCart && $currencyMatches) {
+ // Save order data
+ $this->saveOrderData($returnData);
+ $currency = $this->context->currency;
+ // Order status/amount must reflect what PayPal actually captured,
+ // not the cart's is_advance_payment flag (still editable by the
+ // customer after payment, so it cannot be trusted here).
+ $capturedAmount = isset($returnData['data']['purchase_units'][0]['payments']['captures'][0]['amount']['value']) ?
+ (float) $returnData['data']['purchase_units'][0]['payments']['captures'][0]['amount']['value'] : 0;
+ $fullTotal = (float) $cart->getOrderTotal(true, Cart::BOTH);
+ $isFullyPaid = $capturedAmount >= $fullTotal;
// set order status
- if ($returnData['data']['status'] == 'COMPLETED') {
- if ($cart->is_advance_payment) {
- $orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
- } else {
- $orderStatus = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
- }
+ if ($returnData['data']['status'] == WkPaypalCommerceWebhook::WK_PAYPAL_COMMERCE_PAYMENT_STATUS_COMPLETED) {
+ $orderStatus = $isFullyPaid
+ ? Configuration::get('PS_OS_PAYMENT_ACCEPTED')
+ : Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
} else {
$orderStatus = Configuration::get('PS_OS_AWAITING_PAYMENT');
}
- $extraVars['transaction_id'] = $transaction_id;
+ $transactionId = '';
+ if (isset($returnData['data']['purchase_units'][0]['payments']['captures'][0]['id'])) {
+ $transactionId = $returnData['data']['purchase_units'][0]['payments']['captures'][0]['id'];
+ }
+ $extraVars = array('transaction_id' => $transactionId);
// create order for the payment
$this->module->validateOrder(
$cart->id,
$orderStatus,
- $total,
+ $capturedAmount,
$this->module->l('PayPal Checkout', 'payment'),
null,
$extraVars,
@@ -182,6 +222,18 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
);
Tools::redirect($orderLink);
} else {
+ if ($paypalOrderID && $paymentStatus == WkPaypalCommerceWebhook::WK_PAYPAL_COMMERCE_PAYMENT_STATUS_COMPLETED && !$belongsToCurrentCart) {
+ WkPaypalCommerceHelper::logMsg(
+ 'payment',
+ 'PayPal order/cart mismatch. Expected cart: '.$cart->id.', PayPal custom_id: '.$paypalOrderCartId
+ );
+ }
+ if ($paypalOrderID && $paymentStatus == WkPaypalCommerceWebhook::WK_PAYPAL_COMMERCE_PAYMENT_STATUS_COMPLETED && $belongsToCurrentCart && !$currencyMatches) {
+ WkPaypalCommerceHelper::logMsg(
+ 'payment',
+ 'PayPal currency mismatch. Expected currency: '.$cartCurrency['iso_code'].', PayPal captured currency: '.$capturedCurrency
+ );
+ }
WkPaypalCommerceHelper::logMsg('payment', 'Payment status'. $returnData['data']['status']);
WkPaypalCommerceHelper::logMsg('payment', '--------------', true);
Tools::redirect('index.php?controller=order&step=1');
@@ -209,7 +261,7 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
}
}
break;
- case 3:
+ case self::WK_PAYPAL_COMMERCE_ACTION_CANCELLED:
WkPaypalCommerceHelper::logMsg('payment', 'Payment cancelled by customer...', true);
WkPaypalCommerceHelper::logMsg('payment', json_encode(Tools::getAllValues()));
WkPaypalCommerceHelper::logMsg('payment', '--------------', true);
@@ -227,14 +279,13 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
// Save order data
private function saveOrderData($orderData)
{
- $transaction_id = '';
if ($orderData) {
$purchaseUnits = $orderData['data']['purchase_units'];
foreach ($purchaseUnits as $purchase) {
- $transaction_id = $purchase['payments']['captures'][0]['id'];
- $payment_status = $purchase['payments']['captures'][0]['status'];
- $payment_total = $purchase['payments']['captures'][0]['amount']['value'];
- $payment_curr = $purchase['payments']['captures'][0]['amount']['currency_code'];
+ $transactionId = $purchase['payments']['captures'][0]['id'];
+ $paymentStatus = $purchase['payments']['captures'][0]['status'];
+ $paymentTotal = $purchase['payments']['captures'][0]['amount']['value'];
+ $paymentCurrency = $purchase['payments']['captures'][0]['amount']['currency_code'];
$cart = $this->context->cart;
$currency = Currency::getCurrency((int) $cart->id_currency);
@@ -256,19 +307,21 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
$orderObj->checkout_currency = $currency['iso_code'];
// PayPal Returned Data
- $orderObj->pp_paid_total = (float)$payment_total;
- $orderObj->pp_paid_currency = $payment_curr;
+ $orderObj->pp_paid_total = (float)$paymentTotal;
+ $orderObj->pp_paid_currency = $paymentCurrency;
$orderObj->pp_reference_id = $purchase['reference_id'];
$orderObj->pp_order_id = $orderData['data']['id'];
- $orderObj->pp_transaction_id = $transaction_id;
- $orderObj->pp_payment_status = $payment_status;
+ $orderObj->pp_transaction_id = $transactionId;
+ $orderObj->pp_payment_status = $paymentStatus;
$orderObj->response = json_encode($orderData);
$orderObj->order_date = date('Y-m-d H:i:s');
$orderObj->save();
}
+
+ return true;
}
- return $transaction_id;
+ return false;
}
// Create order data to send to PayPal
@@ -291,17 +344,17 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
);
// address is not required in paypal payment, if customer has added an address then we add tha address to paypal payer object
- if ($bilAddr = $ppHelper->getSimpleAddress(
+ if ($billingAddress = $ppHelper->getSimpleAddress(
(int)$cart->id_customer,
(int)$cart->id_address_invoice
)) {
$orderData['payer']['address'] = array(
- 'address_line_1' => $bilAddr['address1'],
- 'address_line_2' => $bilAddr['address2'],
- 'admin_area_2' => $bilAddr['city'],
- 'admin_area_1' => $bilAddr['state_iso'],
- 'postal_code' => $bilAddr['postcode'],
- 'country_code' => $bilAddr['country_iso'],
+ 'address_line_1' => $billingAddress['address1'],
+ 'address_line_2' => $billingAddress['address2'],
+ 'admin_area_2' => $billingAddress['city'],
+ 'admin_area_1' => $billingAddress['state_iso'],
+ 'postal_code' => $billingAddress['postcode'],
+ 'country_code' => $billingAddress['country_iso'],
);
}
@@ -340,27 +393,27 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
$orderData['purchase_units'][0]['amount'] = array(
'currency_code' => $currency['iso_code'],
- 'value' => Tools::ps_round($cartTotalAmountTI, 2),
+ 'value' => number_format(Tools::ps_round($cartTotalAmountTI, 2), 2, '.', ''),
'breakdown' => array(
'item_total' => array(
'currency_code' => $currency['iso_code'],
- 'value' => Tools::ps_round($itemTotalAmountTE, 2),
+ 'value' => number_format(Tools::ps_round($itemTotalAmountTE, 2), 2, '.', ''),
),
'shipping' => array(
'currency_code' => $currency['iso_code'],
- 'value' => 0,
+ 'value' => '0.00',
),
'shipping_discount' => array(
'currency_code' => $currency['iso_code'],
- 'value' => 0,
+ 'value' => '0.00',
),
'tax_total' => array(
'currency_code' => $currency['iso_code'],
- 'value' => Tools::ps_round(($itemTotalAmountTI - $itemTotalAmountTE), 2),
+ 'value' => number_format(Tools::ps_round(($itemTotalAmountTI - $itemTotalAmountTE), 2), 2, '.', ''),
),
'discount' => array(
'currency_code' => $currency['iso_code'],
- 'value' => Tools::ps_round($discountTI, 2),
+ 'value' => number_format(Tools::ps_round($discountTI, 2), 2, '.', ''),
),
)
);
@@ -369,8 +422,10 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
// $items = $ppHelper->getPaypalOrderItemDetails($cart->id);
// $orderData['purchase_units'][0]['items'] = array_values($items);
+ $wkEnvironment = Configuration::get('WK_PAYPAL_COMMERCE_PAYMENT_MODE');
+ $merchantId = ($wkEnvironment == QloPaypalCommerce::WK_PAYPAL_COMMERCE_PAYMENT_MODE_PRODUCTION) ? Configuration::get('WK_PAYPAL_COMMERCE_LIVE_MERCHANT_ID') : Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_MERCHANT_ID');
$orderData['purchase_units'][0]['payee'] = array(
- 'merchant_id' => Configuration::get('WK_PAYPAL_COMMERCE_MERCHANT_ID')
+ 'merchant_id' => $merchantId
);
$orderData['application_context'] = array(
@@ -380,13 +435,4 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
return $orderData;
}
-
- /**
- * getPriceDecimalPrecision
- * @return void
- */
- private function getPriceDecimalPrecision()
- {
- return _PS_PRICE_COMPUTE_PRECISION_;
- }
-}
+}
\ No newline at end of file
diff --git a/modules/qlopaypalcommerce/controllers/front/webhook.php b/modules/qlopaypalcommerce/controllers/front/webhook.php
index 8315afd89..db62cd7f8 100644
--- a/modules/qlopaypalcommerce/controllers/front/webhook.php
+++ b/modules/qlopaypalcommerce/controllers/front/webhook.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
class QloPaypalCommerceWebhookModuleFrontController extends ModuleFrontController
diff --git a/modules/qlopaypalcommerce/controllers/index.php b/modules/qlopaypalcommerce/controllers/index.php
index 409280877..8d30901e6 100644
--- a/modules/qlopaypalcommerce/controllers/index.php
+++ b/modules/qlopaypalcommerce/controllers/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
diff --git a/modules/qlopaypalcommerce/index.php b/modules/qlopaypalcommerce/index.php
index 409280877..8d30901e6 100644
--- a/modules/qlopaypalcommerce/index.php
+++ b/modules/qlopaypalcommerce/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
diff --git a/modules/qlopaypalcommerce/libs/Helpers/HttpHelper.php b/modules/qlopaypalcommerce/libs/Helpers/HttpHelper.php
index f3c42b7ce..293ef64e1 100644
--- a/modules/qlopaypalcommerce/libs/Helpers/HttpHelper.php
+++ b/modules/qlopaypalcommerce/libs/Helpers/HttpHelper.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
class HttpHelper {
@@ -30,10 +30,6 @@ class HttpHelper {
$this->_initCurl();
}
- public function __destruct() {
- curl_close($this->_curl);
- }
-
private function _initCurl() {
if(!function_exists('curl_version')) {
trigger_error("Curl not available", E_USER_ERROR);
diff --git a/modules/qlopaypalcommerce/libs/Helpers/PayPalHelper.php b/modules/qlopaypalcommerce/libs/Helpers/PayPalHelper.php
index c8735946a..7c1e6bb37 100644
--- a/modules/qlopaypalcommerce/libs/Helpers/PayPalHelper.php
+++ b/modules/qlopaypalcommerce/libs/Helpers/PayPalHelper.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
include_once(dirname(__FILE__) . '/HttpHelper.php');
@@ -67,7 +67,14 @@ class PayPalHelper {
$this->_setDefaultHeaders();
$this->_setAPIVersion('1');
$this->_http->setUrl($this->_createApiUrl("oauth2/token"));
- $this->_http->setAuthentication(Configuration::get('WK_PAYPAL_COMMERCE_CLIENT_ID') . ":" . Configuration::get('WK_PAYPAL_COMMERCE_CLIENT_SECRET'));
+ if (self::isSanboxEnvironment()) {
+ $wkClientId = trim(Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID'));
+ $wkClientSecret = trim(Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_SECRET'));
+ } else {
+ $wkClientId = trim(Configuration::get('WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID'));
+ $wkClientSecret = trim(Configuration::get('WK_PAYPAL_COMMERCE_LIVE_CLIENT_SECRET'));
+ }
+ $this->_http->setAuthentication($wkClientId . ":" . $wkClientSecret);
$this->_http->setBody("grant_type=client_credentials");
$returnData = $this->_http->sendRequest();
$this->_token = $returnData['access_token'];
diff --git a/modules/qlopaypalcommerce/libs/Helpers/index.php b/modules/qlopaypalcommerce/libs/Helpers/index.php
index 150f23072..80123c370 100644
--- a/modules/qlopaypalcommerce/libs/Helpers/index.php
+++ b/modules/qlopaypalcommerce/libs/Helpers/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
diff --git a/modules/qlopaypalcommerce/libs/Orders.php b/modules/qlopaypalcommerce/libs/Orders.php
index c84426caf..ec9dbd6cf 100644
--- a/modules/qlopaypalcommerce/libs/Orders.php
+++ b/modules/qlopaypalcommerce/libs/Orders.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
include_once(dirname(__FILE__) . '/Helpers/PayPalHelper.php');
diff --git a/modules/qlopaypalcommerce/libs/PayPalCommerce.php b/modules/qlopaypalcommerce/libs/PayPalCommerce.php
index a32ea2a4b..602f39588 100644
--- a/modules/qlopaypalcommerce/libs/PayPalCommerce.php
+++ b/modules/qlopaypalcommerce/libs/PayPalCommerce.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
include_once(dirname(__FILE__) . '/Orders.php');
diff --git a/modules/qlopaypalcommerce/libs/index.php b/modules/qlopaypalcommerce/libs/index.php
index 150f23072..80123c370 100644
--- a/modules/qlopaypalcommerce/libs/index.php
+++ b/modules/qlopaypalcommerce/libs/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
diff --git a/modules/qlopaypalcommerce/log/index.php b/modules/qlopaypalcommerce/log/index.php
index 150f23072..80123c370 100644
--- a/modules/qlopaypalcommerce/log/index.php
+++ b/modules/qlopaypalcommerce/log/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
diff --git a/modules/qlopaypalcommerce/qlopaypalcommerce.php b/modules/qlopaypalcommerce/qlopaypalcommerce.php
index 7860bf61b..a9788f736 100644
--- a/modules/qlopaypalcommerce/qlopaypalcommerce.php
+++ b/modules/qlopaypalcommerce/qlopaypalcommerce.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
if (!defined('_PS_VERSION_')) {
@@ -29,10 +29,23 @@ require_once dirname(__FILE__).'/classes/WkClassInclude.php';
class QloPaypalCommerce extends PaymentModule
{
+ const WK_PAYPAL_COMMERCE_PAYMENT_MODE_SANDBOX = 'sandbox';
+ const WK_PAYPAL_COMMERCE_PAYMENT_MODE_PRODUCTION = 'production';
+
private $html = '';
private $postErrors = array();
private $token = '';
+ private $sandboxMerchantId = '';
+ private $sandboxEmail = '';
+ private $sandboxClientId = '';
+ private $sandboxClientSecret = '';
+
+ private $liveMerchantId = '';
+ private $liveEmail = '';
+ private $liveClientId = '';
+ private $liveClientSecret = '';
+
public $ppMode;
public $merchantId;
public $paypalEmail;
@@ -49,7 +62,8 @@ class QloPaypalCommerce extends PaymentModule
$this->bootstrap = true;
$this->secure_key = Tools::encrypt($this->name);
$this->html = '';
- $this->ps_versions_compliancy = array('min' => '1.6', 'max' => '1.6');
+ $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
+ $this->qloapps_versions_compliancy = array('min' => '1.6', 'max' => _QLOAPPS_VERSION_);
$this->displayName = $this->l('QloApps PayPal Checkout');
@@ -72,26 +86,47 @@ class QloPaypalCommerce extends PaymentModule
$config = Configuration::getMultiple(array(
'WK_PAYPAL_COMMERCE_PAYMENT_MODE',
- 'WK_PAYPAL_COMMERCE_MERCHANT_ID',
- 'WK_PAYPAL_COMMERCE_EMAIL',
- 'WK_PAYPAL_COMMERCE_CLIENT_ID',
- 'WK_PAYPAL_COMMERCE_CLIENT_SECRET'
+ 'WK_PAYPAL_COMMERCE_SANDBOX_MERCHANT_ID',
+ 'WK_PAYPAL_COMMERCE_SANDBOX_EMAIL',
+ 'WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID',
+ 'WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_SECRET',
+ 'WK_PAYPAL_COMMERCE_LIVE_MERCHANT_ID',
+ 'WK_PAYPAL_COMMERCE_LIVE_EMAIL',
+ 'WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID',
+ 'WK_PAYPAL_COMMERCE_LIVE_CLIENT_SECRET',
));
if (!empty($config['WK_PAYPAL_COMMERCE_PAYMENT_MODE'])) {
$this->ppMode = $config['WK_PAYPAL_COMMERCE_PAYMENT_MODE'];
}
- if (!empty($config['WK_PAYPAL_COMMERCE_MERCHANT_ID'])) {
- $this->merchantId = $config['WK_PAYPAL_COMMERCE_MERCHANT_ID'];
- }
- if (!empty($config['WK_PAYPAL_COMMERCE_EMAIL'])) {
- $this->paypalEmail = $config['WK_PAYPAL_COMMERCE_EMAIL'];
- }
- if (!empty($config['WK_PAYPAL_COMMERCE_CLIENT_ID'])) {
- $this->clientId = $config['WK_PAYPAL_COMMERCE_CLIENT_ID'];
- }
- if (!empty($config['WK_PAYPAL_COMMERCE_CLIENT_SECRET'])) {
- $this->clientSecret = $config['WK_PAYPAL_COMMERCE_CLIENT_SECRET'];
+ $mode = $this->ppMode ? $this->ppMode : self::WK_PAYPAL_COMMERCE_PAYMENT_MODE_SANDBOX;
+
+ if ($mode == self::WK_PAYPAL_COMMERCE_PAYMENT_MODE_PRODUCTION) {
+ if (!empty($config['WK_PAYPAL_COMMERCE_LIVE_MERCHANT_ID'])) {
+ $this->merchantId = $config['WK_PAYPAL_COMMERCE_LIVE_MERCHANT_ID'];
+ }
+ if (!empty($config['WK_PAYPAL_COMMERCE_LIVE_EMAIL'])) {
+ $this->paypalEmail = $config['WK_PAYPAL_COMMERCE_LIVE_EMAIL'];
+ }
+ if (!empty($config['WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID'])) {
+ $this->clientId = $config['WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID'];
+ }
+ if (!empty($config['WK_PAYPAL_COMMERCE_LIVE_CLIENT_SECRET'])) {
+ $this->clientSecret = $config['WK_PAYPAL_COMMERCE_LIVE_CLIENT_SECRET'];
+ }
+ } else {
+ if (!empty($config['WK_PAYPAL_COMMERCE_SANDBOX_MERCHANT_ID'])) {
+ $this->merchantId = $config['WK_PAYPAL_COMMERCE_SANDBOX_MERCHANT_ID'];
+ }
+ if (!empty($config['WK_PAYPAL_COMMERCE_SANDBOX_EMAIL'])) {
+ $this->paypalEmail = $config['WK_PAYPAL_COMMERCE_SANDBOX_EMAIL'];
+ }
+ if (!empty($config['WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID'])) {
+ $this->clientId = $config['WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID'];
+ }
+ if (!empty($config['WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_SECRET'])) {
+ $this->clientSecret = $config['WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_SECRET'];
+ }
}
parent::__construct();
@@ -101,6 +136,8 @@ class QloPaypalCommerce extends PaymentModule
public function getContent()
{
+ $this->context->controller->addJS($this->_path.'views/js/admin/paypal_config.js');
+
if (!$this->checkPaypalCommerceConfigured()) {
$this->context->controller->warnings[] = $this->l('PayPal Merchant ID, Email, Client ID and Secret must be configured.');
}
@@ -109,7 +146,7 @@ class QloPaypalCommerce extends PaymentModule
$this->context->controller->warnings[] = $this->l('No currency has been set for this module.');
}
- if (Tools::isSubmit('submit_paypal_commerce')) {
+ if (Tools::isSubmit('btnConfigSubmit')) {
$this->postValidation();
if (!count($this->postErrors)) {
$this->postProcess();
@@ -163,42 +200,74 @@ class QloPaypalCommerce extends PaymentModule
'hint' => $this->l('Select PayPal payment environment either sandbox or production. You can get real transaction only on production, for testing, use sandbox.'),
),
array(
- 'label' => $this->l('Merchant ID'),
- 'name' => 'WK_PAYPAL_COMMERCE_MERCHANT_ID',
+ 'label' => $this->l('Sandbox Merchant ID'),
+ 'name' => 'WK_PAYPAL_COMMERCE_SANDBOX_MERCHANT_ID',
'size' => 60,
'type' => 'text',
'required' => true,
- 'hint' => $this->l('Enter the Merchant ID of your PayPal account.'),
+ 'hint' => $this->l('Enter the Merchant ID of your PayPal sandbox account.'),
),
array(
- 'label' => $this->l('Account Email'),
- 'name' => 'WK_PAYPAL_COMMERCE_EMAIL',
+ 'label' => $this->l('Sandbox Account Email'),
+ 'name' => 'WK_PAYPAL_COMMERCE_SANDBOX_EMAIL',
'size' => 60,
'type' => 'text',
'required' => true,
- 'hint' => $this->l('Enter the PayPal Account Email of your PayPal account.'),
+ 'hint' => $this->l('Enter the PayPal Account Email of your PayPal sandbox account.'),
),
array(
- 'label' => $this->l('Client ID'),
- 'name' => 'WK_PAYPAL_COMMERCE_CLIENT_ID',
+ 'label' => $this->l('Sandbox Client ID'),
+ 'name' => 'WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID',
'size' => 100,
'type' => 'text',
'required' => true,
- 'hint' => $this->l('Enter the Client ID from PayPal account app credentials.'),
+ 'hint' => $this->l('Enter the Client ID from PayPal sandbox account app credentials.'),
),
array(
- 'label' => $this->l('Client Secret'),
- 'name' => 'WK_PAYPAL_COMMERCE_CLIENT_SECRET',
+ 'label' => $this->l('Sandbox Client Secret'),
+ 'name' => 'WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_SECRET',
'size' => 100,
'type' => 'text',
'required' => true,
- 'hint' => $this->l('Enter the Client Secret from PayPal account app credentials.'),
+ 'hint' => $this->l('Enter the Client Secret from PayPal sandbox account app credentials.'),
+ ),
+ array(
+ 'label' => $this->l('Live Merchant ID'),
+ 'name' => 'WK_PAYPAL_COMMERCE_LIVE_MERCHANT_ID',
+ 'size' => 60,
+ 'type' => 'text',
+ 'required' => true,
+ 'hint' => $this->l('Enter the Merchant ID of your PayPal live account.'),
+ ),
+ array(
+ 'label' => $this->l('Live Account Email'),
+ 'name' => 'WK_PAYPAL_COMMERCE_LIVE_EMAIL',
+ 'size' => 60,
+ 'type' => 'text',
+ 'required' => true,
+ 'hint' => $this->l('Enter the PayPal Account Email of your PayPal live account.'),
+ ),
+ array(
+ 'label' => $this->l('Live Client ID'),
+ 'name' => 'WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID',
+ 'size' => 100,
+ 'type' => 'text',
+ 'required' => true,
+ 'hint' => $this->l('Enter the Client ID from PayPal live account app credentials.'),
+ ),
+ array(
+ 'label' => $this->l('Live Client Secret'),
+ 'name' => 'WK_PAYPAL_COMMERCE_LIVE_CLIENT_SECRET',
+ 'size' => 100,
+ 'type' => 'text',
+ 'required' => true,
+ 'hint' => $this->l('Enter the Client Secret from PayPal live account app credentials.'),
),
),
'description' => $this->l('PayPal Seller Protection not applicable'),
'submit' => array(
'title' => $this->l('Save'),
- 'name' => 'submit_paypal_commerce',
+ 'name' => 'btnConfigSubmit',
),
);
@@ -225,49 +294,73 @@ class QloPaypalCommerce extends PaymentModule
private function postValidation()
{
- if (Tools::isSubmit('submit_paypal_commerce')) {
- $wkMerchantId = trim(Tools::getValue('WK_PAYPAL_COMMERCE_MERCHANT_ID'));
+ if (Tools::isSubmit('btnConfigSubmit')) {
+ $mode = Tools::getValue('WK_PAYPAL_COMMERCE_PAYMENT_MODE');
+
+ $this->sandboxMerchantId = trim(Tools::getValue('WK_PAYPAL_COMMERCE_SANDBOX_MERCHANT_ID'));
+ $this->sandboxEmail = trim(Tools::getValue('WK_PAYPAL_COMMERCE_SANDBOX_EMAIL'));
+ $this->sandboxClientId = trim(Tools::getValue('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID'));
+ $this->sandboxClientSecret = trim(Tools::getValue('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_SECRET'));
+
+ $this->liveMerchantId = trim(Tools::getValue('WK_PAYPAL_COMMERCE_LIVE_MERCHANT_ID'));
+ $this->liveEmail = trim(Tools::getValue('WK_PAYPAL_COMMERCE_LIVE_EMAIL'));
+ $this->liveClientId = trim(Tools::getValue('WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID'));
+ $this->liveClientSecret = trim(Tools::getValue('WK_PAYPAL_COMMERCE_LIVE_CLIENT_SECRET'));
+
+ if ($mode == self::WK_PAYPAL_COMMERCE_PAYMENT_MODE_PRODUCTION) {
+ $wkMerchantId = $this->liveMerchantId;
+ $wkEmail = $this->liveEmail;
+ $wkClientID = $this->liveClientId;
+ $wkClientSecret = $this->liveClientSecret;
+ } else {
+ $wkMerchantId = $this->sandboxMerchantId;
+ $wkEmail = $this->sandboxEmail;
+ $wkClientID = $this->sandboxClientId;
+ $wkClientSecret = $this->sandboxClientSecret;
+ }
+
if (!$wkMerchantId) {
$this->postErrors[] = $this->l('Please enter Merchant ID');
- } elseif (!preg_match(Tools::cleanNonUnicodeSupport('/[a-zA-Z0-9]+/'), $wkMerchantId)) {
+ } elseif (!preg_match('/^[a-zA-Z0-9]+$/', $wkMerchantId)) {
$this->postErrors[] = $this->l('Invalid Merchant ID provided.');
}
- $wkEmail = trim(Tools::getValue('WK_PAYPAL_COMMERCE_EMAIL'));
if (!$wkEmail) {
$this->postErrors[] = $this->l('Please enter Account Email');
} elseif (!Validate::isEmail($wkEmail)) {
$this->postErrors[] = $this->l('Please enter valid Account Email');
}
- $wkClientID = trim(Tools::getValue('WK_PAYPAL_COMMERCE_CLIENT_ID'));
if (!$wkClientID) {
$this->postErrors[] = $this->l('Please enter Client ID');
+ } elseif (!preg_match('/^[A-Za-z0-9._-]+$/', $wkClientID)) {
+ $this->postErrors[] = $this->l('Invalid Client ID provided.');
}
- $wkClientSecret = trim(Tools::getValue('WK_PAYPAL_COMMERCE_CLIENT_SECRET'));
if (!$wkClientSecret) {
$this->postErrors[] = $this->l('Please enter Client Secret');
+ } elseif (!preg_match('/^[A-Za-z0-9._-]+$/', $wkClientSecret)) {
+ $this->postErrors[] = $this->l('Invalid Client Secret provided.');
}
// Validate PayPal credentials
$this->validatePaypalCredentials();
- if (Tools::getValue('WK_PAYPAL_COMMERCE_PAYMENT_MODE') == 'sandbox'
+ if ($mode == self::WK_PAYPAL_COMMERCE_PAYMENT_MODE_SANDBOX
&& $this->token
) {
if (empty(Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_WEBHOOK_ID'))) {
// Create webhook URL first time
$this->createWebhookUrl('sandbox');
- } elseif (Tools::getValue('WK_PAYPAL_COMMERCE_CLIENT_ID') != Configuration::get('WK_PAYPAL_COMMERCE_CLIENT_ID')) {
+ } elseif ($this->sandboxClientId != Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID')) {
// Delete existing webhook URL if PayPal credential changed
WkPaypalCommerceHelper::deleteWebhookUrl();
$this->createWebhookUrl('sandbox');
}
- } elseif (Tools::getValue('WK_PAYPAL_COMMERCE_PAYMENT_MODE') == 'production'
+ } elseif ($mode == self::WK_PAYPAL_COMMERCE_PAYMENT_MODE_PRODUCTION
&& $this->token
) {
if (empty(Configuration::get('WK_PAYPAL_COMMERCE_LIVE_WEBHOOK_ID'))) {
// Create webhook URL first time
$this->createWebhookUrl('production');
- } elseif (Tools::getValue('WK_PAYPAL_COMMERCE_CLIENT_ID') != Configuration::get('WK_PAYPAL_COMMERCE_CLIENT_ID')) {
+ } elseif ($this->liveClientId != Configuration::get('WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID')) {
// Delete existing webhook URL if PayPal credential changed
WkPaypalCommerceHelper::deleteWebhookUrl();
$this->createWebhookUrl('production');
@@ -309,22 +402,24 @@ class QloPaypalCommerce extends PaymentModule
public function postProcess()
{
if (Tools::isSubmit('btnConfigSubmit')) {
- Configuration::updateValue('WK_PAYPAL_COMMERCE_MERCHANT_ID', trim(Tools::getValue('WK_PAYPAL_COMMERCE_MERCHANT_ID')));
- Configuration::updateValue('WK_PAYPAL_COMMERCE_EMAIL', trim(Tools::getValue('WK_PAYPAL_COMMERCE_EMAIL')));
- Configuration::updateValue('WK_PAYPAL_COMMERCE_CLIENT_ID', trim(Tools::getValue('WK_PAYPAL_COMMERCE_CLIENT_ID')));
- Configuration::updateValue('WK_PAYPAL_COMMERCE_CLIENT_SECRET', trim(Tools::getValue('WK_PAYPAL_COMMERCE_CLIENT_SECRET')));
- Configuration::updateValue('WK_PAYPAL_COMMERCE_PAYMENT_MODE', Tools::getValue('WK_PAYPAL_COMMERCE_PAYMENT_MODE'));
+ $mode = Tools::getValue('WK_PAYPAL_COMMERCE_PAYMENT_MODE');
+
+ Configuration::updateValue('WK_PAYPAL_COMMERCE_SANDBOX_MERCHANT_ID', $this->sandboxMerchantId);
+ Configuration::updateValue('WK_PAYPAL_COMMERCE_SANDBOX_EMAIL', $this->sandboxEmail);
+ Configuration::updateValue('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID', $this->sandboxClientId);
+ Configuration::updateValue('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_SECRET', $this->sandboxClientSecret);
+
+ Configuration::updateValue('WK_PAYPAL_COMMERCE_LIVE_MERCHANT_ID', $this->liveMerchantId);
+ Configuration::updateValue('WK_PAYPAL_COMMERCE_LIVE_EMAIL', $this->liveEmail);
+ Configuration::updateValue('WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID', $this->liveClientId);
+ Configuration::updateValue('WK_PAYPAL_COMMERCE_LIVE_CLIENT_SECRET', $this->liveClientSecret);
+
+ Configuration::updateValue('WK_PAYPAL_COMMERCE_PAYMENT_MODE', $mode);
$moduleConfig = $this->context->link->getAdminLink('AdminModules');
Tools::redirectAdmin(
$moduleConfig.'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name.'&conf=4'
);
-
- // redirect after saving the configuration
- Tools::redirectAdmin(
- $this->context->link->getAdminLink('AdminModules').'&configure='.$this->name.'&tab_module='.$this->tab.
- '&module_name='.$this->name.'&conf=4'
- );
}
}
@@ -383,7 +478,9 @@ class QloPaypalCommerce extends PaymentModule
$currency = Currency::getCurrency((int)$this->context->currency->id);
// // add PayPal script
- $this->context->controller->addJS('https://www.paypal.com/sdk/js?client-id='.Configuration::get('WK_PAYPAL_COMMERCE_CLIENT_ID').'&commit=true&components=buttons&debug=false¤cy='.$currency['iso_code'].'&intent=capture');
+ $mode = Configuration::get('WK_PAYPAL_COMMERCE_PAYMENT_MODE');
+ $clientId = ($mode === self::WK_PAYPAL_COMMERCE_PAYMENT_MODE_PRODUCTION) ? Configuration::get('WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID') : Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID');
+ $this->context->controller->addJS('https://www.paypal.com/sdk/js?client-id='.$clientId.'&commit=true&components=buttons&debug=false¤cy='.$currency['iso_code'].'&intent=capture');
$this->context->controller->addCSS($this->_path.'views/css/front/wk_payment.css');
@@ -443,16 +540,17 @@ class QloPaypalCommerce extends PaymentModule
// Check payment module is configured
public function checkPaypalCommerceConfigured()
{
- if (!isset($this->ppMode)
- || !isset($this->merchantId)
- || !isset($this->paypalEmail)
- || !isset($this->clientId)
- || !isset($this->clientSecret)
- ) {
- return false;
+ $mode = Configuration::get('WK_PAYPAL_COMMERCE_PAYMENT_MODE');
+ if ($mode == self::WK_PAYPAL_COMMERCE_PAYMENT_MODE_PRODUCTION) {
+ return Configuration::get('WK_PAYPAL_COMMERCE_LIVE_MERCHANT_ID')
+ && Configuration::get('WK_PAYPAL_COMMERCE_LIVE_EMAIL')
+ && Configuration::get('WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID')
+ && Configuration::get('WK_PAYPAL_COMMERCE_LIVE_CLIENT_SECRET');
}
-
- return true;
+ return Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_MERCHANT_ID')
+ && Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_EMAIL')
+ && Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID')
+ && Configuration::get('WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_SECRET');
}
public function hookPaymentReturn($params)
diff --git a/modules/qlopaypalcommerce/translations/ca.php b/modules/qlopaypalcommerce/translations/ca.php
index 1ffb99c10..846f6995d 100644
--- a/modules/qlopaypalcommerce/translations/ca.php
+++ b/modules/qlopaypalcommerce/translations/ca.php
@@ -2,22 +2,135 @@
global $_MODULE;
$_MODULE = array();
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dba5abcd5b8bb0ee23a6bde15a6e5fde'] = 'QloApps PayPal Checkout';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dba5abcd5b8bb0ee23a6bde15a6e5fde'] = 'Pagament de PayPal de QloApps';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1639a5f6b16f8d4a04393dbdff0e05f6'] = 'Un negoci global instantani.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dd5e9bb870ec616039f0fe9f2bd4726b'] = 'Una integració per a totes les vostres necessitats de pagament en línia.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dd5e9bb870ec616039f0fe9f2bd4726b'] = 'Una integració per a totes les teves necessitats de pagament en línia.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e654f7a86a4458b9cd662267e0f29b52'] = 'Beneficis';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e0a9745011703bc991ab1af1f50ccd20'] = 'Activeu una experiència de compra perfecta per als vostres clients que fomenti la conversió i la fidelització.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_af0fd51a752f317a87b2f7b724856034'] = 'Accepteu els pagaments de PayPal amb incorporació simplificada, integració adaptable i fàcil configuració del compte.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b50f4dec6df62993204153f8d5db2c'] = 'Accés a clients de 377M + PayPal de tot el món *, amb suport en moneda local per a una millor gestió dels diners.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_cb47de9d9350a9025c8c3b657c8c8268'] = 'Tranquil·litat per a vosaltres i els vostres clients amb protecció del comprador i del venedor en vendes elegibles.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_8332b9ae4d8931da4a311f410a232619'] = 'Resultat del quart trimestre de PayPal 2020';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1e4fe71e24592a98260048fe05cbbb5b'] = 'Cal configurar l’identificador de comerciant de PayPal, el correu electrònic, l’identificador de client i el secret.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a02758d758e8bec77a33d7f392eb3f8a'] = 'No s\'ha establert cap moneda per a aquest mòdul.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_afcae56aeb45bbff848348abf4824b44'] = 'Configuració de pagament de PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_116e78f6c1c4b4f66a57192817242e35'] = 'Entorn de transaccions';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_2652eec977dcb2a5aea85f5bec235b05'] = 'Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e0a9745011703bc991ab1af1f50ccd20'] = 'Habilita una experiència de compra fluida per als teus clients que impulsi la conversió i la fidelització.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_af0fd51a752f317a87b2f7b724856034'] = 'Accepta pagaments de PayPal amb una incorporació simplificada, una integració adaptable i una configuració de compte fàcil.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b50f4dec6df62993204153f8d5db2c'] = 'Accés a més de 377 milions de clients de PayPal arreu del món*, amb compatibilitat amb la moneda local per a una millor gestió dels diners.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_cb47de9d9350a9025c8c3b657c8c8268'] = 'Tranquil·litat per a tu i els teus clients amb la protecció del comprador i del venedor en les vendes elegibles.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_8332b9ae4d8931da4a311f410a232619'] = 'Resultat de PayPal del quart trimestre del 2020';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1e4fe71e24592a98260048fe05cbbb5b'] = 'Cal configurar l\'ID de comerciant, el correu electrònic, l\'ID de client i el secret de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a02758d758e8bec77a33d7f392eb3f8a'] = 'No s\'ha definit cap moneda per a aquest mòdul.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_afcae56aeb45bbff848348abf4824b44'] = 'Configuració de pagaments de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_116e78f6c1c4b4f66a57192817242e35'] = 'Entorn de transacció';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_2652eec977dcb2a5aea85f5bec235b05'] = 'Zona de proves';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_756d97bb256b8580d4d71ee0c547804e'] = 'Producció';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_bb6e852329aacf2cc839e01ab1ce1773'] = 'Seleccioneu l\'entorn de pagament de PayPal, ja sigui sandbox o producció. Podeu obtenir transaccions reals només en producció, per provar-les, utilitzeu sandbox.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_bb6e852329aacf2cc839e01ab1ce1773'] = 'Seleccioneu l\'entorn de pagament de PayPal, ja sigui sandbox o producció. Només podeu obtenir transaccions reals en producció; per a proves, utilitzeu sandbox.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_ed4f8785248e2d9a8a8b25e5c483551a'] = 'ID de comerciant de Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_6d132ffd3d699649441bdc627dd57eba'] = 'Introduïu l\'ID de comerciant del vostre compte de prova de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_36808d0f8a32391ba62716d9831040e5'] = 'Correu electrònic del compte de Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_ff8336737d5f067b6c11724bd6fc944e'] = 'Introduïu el correu electrònic del compte de PayPal del vostre compte de sandbox de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a0bd7d42b20f8ca0c6f28bdd30a1af1f'] = 'ID de client de Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e7b65a83fa18a3396a4b140483e6f288'] = 'Introduïu l\'ID de client de les credencials de l\'aplicació del compte de prova de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_9af7eae52a08a132e079c3e910bb2cbe'] = 'Secret del client de Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_023d4f770106b82c4984d38c9033d393'] = 'Introduïu el secret del client des de les credencials de l\'aplicació del compte de prova de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_450e2248dad7a152379bf016310e1eba'] = 'ID de comerciant en directe';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3058efc14b28f688630f4e6770db5f03'] = 'Introduïu l\'ID de comerciant del vostre compte real de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c916854e86ef605147fce41d400b6d74'] = 'Correu electrònic del compte en directe';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_05e0b13ee68a1adcd4939da789611213'] = 'Introdueix el correu electrònic del compte de PayPal del teu compte real de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1087b413bc531d99ee4deb93e280bfed'] = 'ID de client en directe';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dfa5a074df3ad0ca4018a93243fcce1e'] = 'Introduïu l\'ID de client de les credencials de l\'aplicació de compte en directe de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b75793dc0a1d8225b39b8be4392339'] = 'Secret de client en directe';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1382bf9075c663adbf10818ed4789234'] = 'Introduïu el secret del client de les credencials de l\'aplicació de compte en directe de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_783901fa167d90d82463e71da67c5e52'] = 'La protecció del venedor de PayPal no és aplicable.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c9cc8cce247e49bae79f15173ce97354'] = 'Desa';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a1c0702a8ce0c1562b372b93b5b8ae70'] = 'Si us plau, introduïu l\'ID del comerciant';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_5f8d20654b3683fd837ad6766a99b388'] = 'S\'ha proporcionat un ID de comerciant no vàlid.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_451ad04779375f902c3c9de28f096f42'] = 'Si us plau, introduïu el correu electrònic del compte';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a23555edc4d09483a2d5d84478a6e8d3'] = 'Si us plau, introduïu un correu electrònic vàlid del compte';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_d78b4ac6843d2634c46a59c2d0c2629d'] = 'Si us plau, introduïu l\'ID del client';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3640405a6244a23f537de55975337bf3'] = 'Si us plau, introduïu el secret del client';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_89493d1e532e6577510bbd93052bf20c'] = 'El pagador va iniciar una disputa amb PayPal per aquest pagament capturat.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_9c28e950fb310ee005da61698456bc61'] = 'Els fons capturats es van revertir en resposta a la disputa del pagador sobre aquest pagament capturat amb l\'emissor de l\'instrument financer utilitzat per pagar aquest pagament capturat.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_e2740ccb963c88d2739ee7ff5d493235'] = 'El pagador ha pagat amb un xec electrònic que encara no s\'ha compensat.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_4e3da671b7e244adc46f9093e150fd99'] = 'Visita el teu compte en línia. A la **Visió general del compte**, accepta i rebutja aquest pagament.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_f3d713097a36e0a9f589755465883f91'] = 'No es pot proporcionar cap raó específica addicional. Per obtenir més informació sobre aquest pagament capturat, visiteu el vostre compte en línia o contacteu amb PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_04263f8fe176af4cd42d9756fc136cfe'] = 'El pagament capturat està pendent de revisió manual.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_c343691c63a475e04acf19b98945bc59'] = 'El beneficiari encara no ha configurat les preferències de recepció adequades per al seu compte. Per obtenir més informació sobre com acceptar o rebutjar aquest pagament, visiteu el vostre compte en línia. Aquest motiu s\'ofereix normalment en casos com ara quan la moneda del pagament capturat és diferent de la moneda principal del beneficiari.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_71013ee01f1a31c0310bcf4a91162c29'] = 'Els fons capturats van ser retornats.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_a4656378d78c3d73b354ddc0d4dabe18'] = 'El pagador ha d\'enviar els fons per a aquest pagament capturat. Aquest codi apareix generalment per a les transferències bancàries manuals.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_1bca65212e4eba1b64766eeb66091af2'] = 'El beneficiari no té un compte de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_53c3196bca5dde9b71e5be8287ae9cde'] = 'El compte de PayPal del beneficiari no està verificat';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_a7a37ae71b70fe671308691cc6fe03dc'] = 'Transaccions de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Referència de la comanda';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_55307c995094996234479b33fbc16bd1'] = 'Referència de comanda a QloApps de la transacció de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'ID de transacció de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_dae74f84a69dab4b8e04999f2460febf'] = 'Identificador de la transacció de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2763b4242763cbee7190de46d45d204f'] = 'Total de la transacció';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_e8453b7e2a7ccf2edeae228682a61b8d'] = 'Import total pagat en la transacció de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ce26601dac0dea138b7295f02b7620a7'] = 'Client';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_41a9d5e195648f50143f1c1abf5e00e6'] = 'Client de QloApps que va fer una transacció amb PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ec53a8c4f07baed5d8825072c89799be'] = 'Estat';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2ea78fadfafeae47ad786c288667eadf'] = 'Estat del pagament';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_3516529c1d87f5fde62d6841140f5dc0'] = 'Estat actual de la transacció de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6fbc355a02359656f1e4540d58b784e1'] = 'Data de la comanda';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_168f21218c30dcc245dc1c62c103cb7b'] = 'Data de creació de la comanda.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_630f6dc397fe74e52d5189e2c80f282b'] = 'Torna a la llista';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2a43821ec21eadc4073fc65dc35d2198'] = 'Tipus de reemborsament no vàlid.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_4e7f26d58027e5f9611cc5fe9d901e06'] = 'Import de reemborsament no vàlid.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_5eaf60217767a2ad1e30d36dc3a1c12c'] = 'Introduïu un motiu de reemborsament vàlid (només es permeten caràcters alfanumèrics).';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ee4f91ae6dc5a35a0060efa164cb65d9'] = 'Import de reemborsament no vàlid. L\'import màxim disponible per a la devolució és';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6a8b1040e75c9723eef0a783ffc0e1d2'] = 'El reemborsament ja s\'ha fet per aquesta transacció.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_446b416d535ed3f547fcd653dc11d49c'] = 'Sol·licitud no vàlida';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Aquest mètode de pagament no està disponible.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_2b46a852749d321a4c6eafa3b36b643c'] = 'Pagament de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_78170aac364ebe8527577b742dc2111d'] = 'Detalls de la transacció de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_34c15b4659b2241667e4c5d534270a17'] = 'Entorn de pagament';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2652eec977dcb2a5aea85f5bec235b05'] = 'Zona de proves';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_756d97bb256b8580d4d71ee0c547804e'] = 'Producció';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_6f097b8feb2af129c8f74c786c130c1c'] = 'ID de referència de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'ID de transacció de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_157c928dae48d88d19fb2ced2afbdd71'] = 'ID de comanda de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_fdabf4e63a3cc1fe987269ff4e629148'] = 'Import de la transacció';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Referència de la comanda';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea989f83006e233627987293f4bde0a'] = 'Nom del client';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_54945fdafec2c65f0f5561d65b165f1a'] = 'Correu electrònic del client';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_475007c00d7c166cca01a44ecfd068ff'] = 'Veure client';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_4351cfebe4b61d8aa5efa1d020710005'] = 'Vista';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea78fadfafeae47ad786c288667eadf'] = 'Estat del pagament';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_8f7afecbc8fbc4cd0f50a57d1172482e'] = 'COMPLETAT';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_31738cd694667ccdfa2cbc65249de5cc'] = 'Data de pagament';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_580d87d5c5121696825f17708b1ec065'] = 'Import total reemborsat';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_8b123a0f5d61720a4273bc4ed1d613a3'] = 'Transacció de reemborsament';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a3a13394565fb6956d6948a1dbb8fe3f'] = 'Import total reemborsat';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_9d9dca90e919bd4c8febf55ea7a25b5f'] = 'Import total disponible per a reemborsament';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_51890b292429265077afcc0b2bb6f34a'] = 'Seleccioneu el tipus de reemborsament. Seleccioneu reemborsament parcial per reemborsar l\'import parcial de la transacció. Seleccioneu reemborsament complet per reemborsar l\'import total de la transacció.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_d8fb839f1db11646b85354c3fb50fda3'] = 'Tipus de reemborsament';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_4f5a217b333e276be931951be6dc28f0'] = 'Selecciona el tipus de reemborsament';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_abcec07843d3ec02783b27587560f85f'] = 'Reemborsament complet';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_c985a711556e2edf5cac28dfbdb43ff0'] = 'Reemborsament parcial';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_84bca5dc34bb0d1244a9e0f323878665'] = 'Introduïu l\'import que voleu reemborsar de l\'import de la transacció.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_b782d4ff61550d7e8cdee4cf70a03788'] = 'Import del reemborsament';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_6bbeabf389367bc93090db6dd0c13c4e'] = 'màx.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_85689c24167c4690a0e346c46a17598c'] = 'Introduïu un comentari per a aquest reemborsament.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_97d8f33367ecaeee79d5255b447c8827'] = 'Comentari de reemborsament';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_76f0ed934de85cc7131910b32ede7714'] = 'Reemborsament';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_072ab77c58ea38de4e3272c3eed624c1'] = 'Llista de reemborsaments';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_88427ec035734b45aae9f7d8859a5008'] = 'ID de transacció';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_b2f40690858b404ed10e62bdf422c704'] = 'Import';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a1fa27779242b4902f7ae3bdd5c6d508'] = 'Tipus';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_ec53a8c4f07baed5d8825072c89799be'] = 'Estat';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_44749712dbec183e983dcd78a7736c41'] = 'Data';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_91921ada405fd6ba65dff028df047cb6'] = 'Observació';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a207494d393a4f4909f746fd24440440'] = 'Encara no s\'ha creat cap reembossament.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_e3bc22b32f4abd925670253972326260'] = 'Import total reemborsat:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_7b12dad517fd9056aabf8099a8173ddf'] = 'El vostre pagament ha fallat pel següent motiu:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_3d9f514d46849760ef1b1412e314fd99'] = 'Error:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_0d6779532e0735f6a9b05723ab191bc3'] = 'Descripció de l\'error:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_569fd05bdafa1712c4f6be5b153b8418'] = 'Altres mètodes de pagament';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_cancel_ack_0e1b6078789badcbfae8640288a46f0f'] = 'Has cancel·lat el pagament amb PayPal. Pots tornar-ho a intentar amb PayPal o provar un altre mètode de pagament.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'La teva comanda a %s s\'ha completat.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_cd44f47a868e5e42fa1a23b775504490'] = 'Import total pagat';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_19c419a8a4f1cd621853376a930a2e24'] = 'S\'ha enviat un correu electrònic amb aquesta informació.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_30163d8fc3068e8297e7ab5bf32aec87'] = 'La seva comanda serà enviada tan aviat com sigui possible.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_ca7e41a658753c87973936d7ce2429a8'] = 'Si teniu preguntes, comentaris o dubtes, poseu-vos en contacte amb el nostre';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_66fcf4c223bbf4c7c886d4784e1f62e4'] = 'equip expert d\'atenció al client';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_7c2ed2f8a5fc3c48f2d49196f96b34b1'] = 'Hem detectat un problema amb el vostre pagament. Poseu-vos en contacte amb el nostre';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_17a17ba93e6ac0192bd563905e87538d'] = 'Paga amb les opcions de pagament de Paypal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_644253cd300d73471cf86296d532b964'] = 'Paga amb Paypal';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_25e8f2fd2871c8423bbe4e254066cd98'] = 'Si us plau, espereu...';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_229a7ec501323b94db7ff3157a7623c9'] = 'Identificador de comerciant';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_daa9d1b5682c462e8fc8585bb4cf868c'] = 'Introduïu l\'identificador de comerciant del vostre compte de PayPal.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_275f5257af70b08ed6def799bfa214b3'] = 'Correu electrònic del compte';
@@ -26,97 +139,4 @@ $_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_76525f0f34b48475e5ca3
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_21fb87c3b83156a1c9e7c51239705335'] = 'Introduïu l\'identificador de client des de les credencials de l\'aplicació del compte PayPal.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_734082edf44417dd19cc65943aa65c36'] = 'Secret del client';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_92718280c77bfa861693c57bad5a0632'] = 'Introduïu el secret del client des de les credencials de l\'aplicació del compte PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_783901fa167d90d82463e71da67c5e52'] = 'La protecció del venedor de PayPal no és aplicable';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c9cc8cce247e49bae79f15173ce97354'] = 'Desa';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a1c0702a8ce0c1562b372b93b5b8ae70'] = 'Introduïu l\'identificador de comerciant';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_5f8d20654b3683fd837ad6766a99b388'] = 'S\'ha proporcionat un identificador de comerciant no vàlid.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_451ad04779375f902c3c9de28f096f42'] = 'Introduïu el correu electrònic del compte';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a23555edc4d09483a2d5d84478a6e8d3'] = 'Introduïu el correu electrònic del compte vàlid';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_d78b4ac6843d2634c46a59c2d0c2629d'] = 'Introduïu l\'identificador de client';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3640405a6244a23f537de55975337bf3'] = 'Introduïu Secret del client';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_89493d1e532e6577510bbd93052bf20c'] = 'El pagador va iniciar una disputa per aquest pagament capturat amb PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_9c28e950fb310ee005da61698456bc61'] = 'Els fons capturats es van invertir en resposta a que el pagador disputava aquest pagament capturat amb l\'emissor de l\'instrument financer utilitzat per pagar aquest pagament capturat.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_e2740ccb963c88d2739ee7ff5d493235'] = 'El pagador ha pagat mitjançant un eCheck que encara no s’ha esborrat.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_4e3da671b7e244adc46f9093e150fd99'] = 'Visiteu el vostre compte en línia. A la vostra ** Visió general del compte **, accepteu i denegueu aquest pagament.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_f3d713097a36e0a9f589755465883f91'] = 'No es pot proporcionar cap motiu específic addicional. Per obtenir més informació sobre aquest pagament capturat, visiteu el vostre compte en línia o contacteu amb PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_04263f8fe176af4cd42d9756fc136cfe'] = 'El pagament capturat està pendent de revisió manual.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_c343691c63a475e04acf19b98945bc59'] = 'El beneficiari encara no ha configurat les preferències de recepció adequades per al seu compte. Per obtenir més informació sobre com acceptar o denegar aquest pagament, visiteu el vostre compte en línia. Aquest motiu s’ofereix normalment en situacions com ara quan la moneda del pagament capturat és diferent de la moneda principal del beneficiari.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_71013ee01f1a31c0310bcf4a91162c29'] = 'Es van retornar els fons capturats.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_a4656378d78c3d73b354ddc0d4dabe18'] = 'El pagador ha d’enviar els fons d’aquest pagament capturat. Aquest codi apareix generalment per als EFT manuals.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_1bca65212e4eba1b64766eeb66091af2'] = 'El beneficiari no té cap compte de PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_53c3196bca5dde9b71e5be8287ae9cde'] = 'El compte PayPal del beneficiari no està verificat';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_a7a37ae71b70fe671308691cc6fe03dc'] = 'Transaccions PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_1e860e56970a81a1ba3e1fcb7fccc846'] = 'ordre de referència';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_55307c995094996234479b33fbc16bd1'] = 'Referència de la comanda a QloApps de la transacció PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'Identificador de transacció PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_dae74f84a69dab4b8e04999f2460febf'] = 'Identificador de la transacció PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2763b4242763cbee7190de46d45d204f'] = 'Total de transaccions';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_e8453b7e2a7ccf2edeae228682a61b8d'] = 'Import total pagat en la transacció PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ce26601dac0dea138b7295f02b7620a7'] = 'Client';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_41a9d5e195648f50143f1c1abf5e00e6'] = 'Client de les aplicacions QloApps que va fer la transacció PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ec53a8c4f07baed5d8825072c89799be'] = 'Estat';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2ea78fadfafeae47ad786c288667eadf'] = 'Estat de pagament';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_3516529c1d87f5fde62d6841140f5dc0'] = 'Estat actual de la transacció PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6fbc355a02359656f1e4540d58b784e1'] = 'Data d\'Ordre';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_168f21218c30dcc245dc1c62c103cb7b'] = 'Data de creació de la comanda.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_630f6dc397fe74e52d5189e2c80f282b'] = 'Torna a la llista';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2a43821ec21eadc4073fc65dc35d2198'] = 'El tipus de reembossament no és vàlid.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_4e7f26d58027e5f9611cc5fe9d901e06'] = 'La quantitat de reembossament no és vàlida.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_5eaf60217767a2ad1e30d36dc3a1c12c'] = 'Introduïu un motiu de devolució vàlid (només es permet l\'alfanumèric).';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ee4f91ae6dc5a35a0060efa164cb65d9'] = 'La quantitat de reembossament no és vàlida. Màx. l\'import disponible per a la devolució és de';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6a8b1040e75c9723eef0a783ffc0e1d2'] = 'El reembossament ja s’ha realitzat per aquesta transacció.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_446b416d535ed3f547fcd653dc11d49c'] = 'Sol · licitud no vàlida';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Aquesta forma de pagament no està disponible.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_2b46a852749d321a4c6eafa3b36b643c'] = 'Pagament de PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_78170aac364ebe8527577b742dc2111d'] = 'Detalls de la transacció de PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_34c15b4659b2241667e4c5d534270a17'] = 'Entorn de pagament';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2652eec977dcb2a5aea85f5bec235b05'] = 'Sandbox';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_756d97bb256b8580d4d71ee0c547804e'] = 'Producció';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_6f097b8feb2af129c8f74c786c130c1c'] = 'Identificador de referència de PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'Identificador de transacció PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_157c928dae48d88d19fb2ced2afbdd71'] = 'Identificador de comanda de PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_fdabf4e63a3cc1fe987269ff4e629148'] = 'Import de la transacció';
$_MODULE['<{qlopaypalcommerce}prestashop>view_e98b5a6351fecb55b2f890686f31856d'] = 'Referència de la comanda de QloApps';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea989f83006e233627987293f4bde0a'] = 'Nom del client';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_54945fdafec2c65f0f5561d65b165f1a'] = 'Correu electrònic del client';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_475007c00d7c166cca01a44ecfd068ff'] = 'Veure client';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_4351cfebe4b61d8aa5efa1d020710005'] = 'Veure';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea78fadfafeae47ad786c288667eadf'] = 'Estat de pagament';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_8f7afecbc8fbc4cd0f50a57d1172482e'] = 'COMPLETAT';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_31738cd694667ccdfa2cbc65249de5cc'] = 'Data de pagament';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_580d87d5c5121696825f17708b1ec065'] = 'Import total reemborsat';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_8b123a0f5d61720a4273bc4ed1d613a3'] = 'Transacció de reembossament';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a3a13394565fb6956d6948a1dbb8fe3f'] = 'Import total reemborsat';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_9d9dca90e919bd4c8febf55ea7a25b5f'] = 'Import total disponible a reemborsar';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_51890b292429265077afcc0b2bb6f34a'] = 'Seleccioneu el tipus de reembossament. Seleccioneu el reembossament parcial per reembossar l\'import parcial de la transacció. Seleccioneu el reembossament complet per retornar l\'import total de la transacció.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_d8fb839f1db11646b85354c3fb50fda3'] = 'Tipus de devolució';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_4f5a217b333e276be931951be6dc28f0'] = 'Seleccioneu el tipus de reembossament';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_abcec07843d3ec02783b27587560f85f'] = 'Reemborsament complet';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_c985a711556e2edf5cac28dfbdb43ff0'] = 'Reembossament parcial';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_84bca5dc34bb0d1244a9e0f323878665'] = 'Introduïu l\'import que voleu reembossar a partir de l\'import de la transacció.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_b782d4ff61550d7e8cdee4cf70a03788'] = 'Reemborsament';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_6bbeabf389367bc93090db6dd0c13c4e'] = 'màx.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_85689c24167c4690a0e346c46a17598c'] = 'Introduïu un comentari per a aquest reembossament.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_97d8f33367ecaeee79d5255b447c8827'] = 'Observació de devolució';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_76f0ed934de85cc7131910b32ede7714'] = 'Reembossament';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_072ab77c58ea38de4e3272c3eed624c1'] = 'Llista de devolucions';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_88427ec035734b45aae9f7d8859a5008'] = 'Identificador de transacció';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_b2f40690858b404ed10e62bdf422c704'] = 'Import';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a1fa27779242b4902f7ae3bdd5c6d508'] = 'Tipus';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_ec53a8c4f07baed5d8825072c89799be'] = 'Estat';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_44749712dbec183e983dcd78a7736c41'] = 'Data';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a207494d393a4f4909f746fd24440440'] = 'Encara no s\'ha creat cap devolució.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_e3bc22b32f4abd925670253972326260'] = 'Import total reemborsat: ';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_7b12dad517fd9056aabf8099a8173ddf'] = 'El vostre pagament ha fallat pel següent motiu:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_3d9f514d46849760ef1b1412e314fd99'] = 'Error:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_0d6779532e0735f6a9b05723ab191bc3'] = 'Descripció de l\'error:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_569fd05bdafa1712c4f6be5b153b8418'] = 'Altres formes de pagament';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_cancel_ack_0e1b6078789badcbfae8640288a46f0f'] = 'Heu cancel·lat el pagament mitjançant PayPal. Podeu tornar-ho a provar amb PayPal o provar una altra forma de pagament.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'La vostra comanda a% s s\'ha completat.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_cd44f47a868e5e42fa1a23b775504490'] = 'Import total pagat';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_19c419a8a4f1cd621853376a930a2e24'] = 'S\'ha enviat un correu electrònic amb aquesta informació.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_30163d8fc3068e8297e7ab5bf32aec87'] = 'La vostra comanda s’enviarà el més aviat possible.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_ca7e41a658753c87973936d7ce2429a8'] = 'Si teniu preguntes, comentaris o dubtes, poseu-vos en contacte amb el nostre';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_66fcf4c223bbf4c7c886d4784e1f62e4'] = 'equip expert d’atenció al client';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_7c2ed2f8a5fc3c48f2d49196f96b34b1'] = 'Hem detectat un problema amb el vostre pagament. Poseu-vos en contacte amb el nostre';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_25e8f2fd2871c8423bbe4e254066cd98'] = 'Espera ...';
diff --git a/modules/qlopaypalcommerce/translations/es.php b/modules/qlopaypalcommerce/translations/es.php
index d28c09069..af7ffab1e 100644
--- a/modules/qlopaypalcommerce/translations/es.php
+++ b/modules/qlopaypalcommerce/translations/es.php
@@ -2,71 +2,75 @@
global $_MODULE;
$_MODULE = array();
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dba5abcd5b8bb0ee23a6bde15a6e5fde'] = 'Pago de QloApps PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1639a5f6b16f8d4a04393dbdff0e05f6'] = 'Un negocio global instantáneo.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dd5e9bb870ec616039f0fe9f2bd4726b'] = 'Una integración para todas sus necesidades de pago en línea.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e654f7a86a4458b9cd662267e0f29b52'] = 'Beneficios';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e0a9745011703bc991ab1af1f50ccd20'] = 'Habilite una experiencia de compra perfecta para sus clientes que impulse la conversión y la lealtad.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_af0fd51a752f317a87b2f7b724856034'] = 'Acepte pagos de PayPal con una incorporación simplificada, una integración adaptable y una configuración de cuenta sencilla.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b50f4dec6df62993204153f8d5db2c'] = 'Acceso a más de 377 millones de clientes de PayPal en todo el mundo *, con soporte en moneda local para una mejor gestión del dinero.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_cb47de9d9350a9025c8c3b657c8c8268'] = 'Tranquilidad para usted y sus clientes con protección para compradores y vendedores en ventas elegibles.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_8332b9ae4d8931da4a311f410a232619'] = 'Resultado de PayPal del cuarto trimestre de 2020';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1e4fe71e24592a98260048fe05cbbb5b'] = 'Deben configurarse el ID de comerciante de PayPal, el correo electrónico, el ID de cliente y el secreto.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a02758d758e8bec77a33d7f392eb3f8a'] = 'No se ha establecido ninguna moneda para este módulo.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e0a9745011703bc991ab1af1f50ccd20'] = 'Ofrezca a sus clientes una experiencia de compra fluida que impulse la conversión y la fidelización.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_af0fd51a752f317a87b2f7b724856034'] = 'Acepte pagos con PayPal gracias a un proceso de incorporación simplificado, una integración adaptable y una configuración de cuenta sencilla.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b50f4dec6df62993204153f8d5db2c'] = 'Acceso a más de 377 millones de clientes de PayPal en todo el mundo*, con soporte para monedas locales para una mejor gestión del dinero.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_cb47de9d9350a9025c8c3b657c8c8268'] = 'Tranquilidad para usted y sus clientes gracias a la protección que ofrecen tanto al comprador como al vendedor en las ventas que cumplan los requisitos.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_8332b9ae4d8931da4a311f410a232619'] = 'Resultados de PayPal del cuarto trimestre de 2020';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1e4fe71e24592a98260048fe05cbbb5b'] = 'Se deben configurar el ID de comerciante de PayPal, el correo electrónico, el ID de cliente y la clave secreta.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a02758d758e8bec77a33d7f392eb3f8a'] = 'No se ha configurado ninguna moneda para este módulo.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_afcae56aeb45bbff848348abf4824b44'] = 'Configuración de pago de PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_116e78f6c1c4b4f66a57192817242e35'] = 'Entorno de transacción';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_2652eec977dcb2a5aea85f5bec235b05'] = 'Salvadera';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_756d97bb256b8580d4d71ee0c547804e'] = 'Producción';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_bb6e852329aacf2cc839e01ab1ce1773'] = 'Seleccione el entorno de pago de PayPal, ya sea sandbox o producción. Puede obtener transacciones reales solo en producción, para pruebas, use sandbox.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_229a7ec501323b94db7ff3157a7623c9'] = 'Identificación del comerciante';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_daa9d1b5682c462e8fc8585bb4cf868c'] = 'Ingrese el ID de comerciante de su cuenta PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_275f5257af70b08ed6def799bfa214b3'] = 'Cuenta de email';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_9b022ec729030a4e40c533c61668d128'] = 'Ingrese el correo electrónico de la cuenta de PayPal de su cuenta de PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_76525f0f34b48475e5ca33f71d296f3b'] = 'Identificación del cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_21fb87c3b83156a1c9e7c51239705335'] = 'Ingrese el ID de cliente de las credenciales de la aplicación de la cuenta de PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_734082edf44417dd19cc65943aa65c36'] = 'Secreto del cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_92718280c77bfa861693c57bad5a0632'] = 'Ingrese el secreto del cliente de las credenciales de la aplicación de la cuenta de PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_783901fa167d90d82463e71da67c5e52'] = 'Protección al vendedor de PayPal no aplicable';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c9cc8cce247e49bae79f15173ce97354'] = 'Salvar';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a1c0702a8ce0c1562b372b93b5b8ae70'] = 'Ingrese el ID del comerciante';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_5f8d20654b3683fd837ad6766a99b388'] = 'Se proporcionó un ID de comerciante no válido.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_451ad04779375f902c3c9de28f096f42'] = 'Ingrese el correo electrónico de la cuenta';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a23555edc4d09483a2d5d84478a6e8d3'] = 'Ingrese un correo electrónico de cuenta válido';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_d78b4ac6843d2634c46a59c2d0c2629d'] = 'Ingrese el ID de cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3640405a6244a23f537de55975337bf3'] = 'Ingrese el secreto del cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_89493d1e532e6577510bbd93052bf20c'] = 'El pagador inició una disputa por este pago capturado con PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_9c28e950fb310ee005da61698456bc61'] = 'Los fondos capturados fueron revertidos en respuesta a que el pagador impugnó este pago capturado con el emisor del instrumento financiero utilizado para pagar este pago capturado.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_e2740ccb963c88d2739ee7ff5d493235'] = 'El pagador pagó mediante un cheque electrónico que aún no se ha compensado.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_4e3da671b7e244adc46f9093e150fd99'] = 'Visite su cuenta en línea. En su ** Descripción general de la cuenta **, acepte y rechace este pago.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_f3d713097a36e0a9f589755465883f91'] = 'No se puede proporcionar ninguna razón específica adicional. Para obtener más información sobre este pago capturado, visite su cuenta en línea o comuníquese con PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_04263f8fe176af4cd42d9756fc136cfe'] = 'El pago capturado está pendiente de revisión manual.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_c343691c63a475e04acf19b98945bc59'] = 'El beneficiario aún no ha configurado las preferencias de recepción adecuadas para su cuenta. Para obtener más información sobre cómo aceptar o rechazar este pago, visite su cuenta en línea. Esta razón se ofrece típicamente en escenarios como cuando la moneda del pago capturado es diferente de la moneda de tenencia principal del beneficiario.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_71013ee01f1a31c0310bcf4a91162c29'] = 'Los fondos capturados fueron reembolsados.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_a4656378d78c3d73b354ddc0d4dabe18'] = 'El pagador debe enviar los fondos para este pago capturado. Este código generalmente aparece para EFT manuales.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_bb6e852329aacf2cc839e01ab1ce1773'] = 'Seleccione el entorno de pago de PayPal: entorno de pruebas (sandbox) o entorno de producción. Solo en producción se pueden realizar transacciones reales; para realizar pruebas, utilice el entorno de pruebas.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_ed4f8785248e2d9a8a8b25e5c483551a'] = 'ID de comerciante de entorno de pruebas';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_6d132ffd3d699649441bdc627dd57eba'] = 'Introduce el ID de comerciante de tu cuenta de prueba de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_36808d0f8a32391ba62716d9831040e5'] = 'Correo electrónico de la cuenta de Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_ff8336737d5f067b6c11724bd6fc944e'] = 'Introduce el correo electrónico de tu cuenta de PayPal de prueba.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a0bd7d42b20f8ca0c6f28bdd30a1af1f'] = 'ID de cliente de Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e7b65a83fa18a3396a4b140483e6f288'] = 'Introduzca el ID de cliente de las credenciales de la aplicación de la cuenta de prueba de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_9af7eae52a08a132e079c3e910bb2cbe'] = 'Secreto del cliente de Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_023d4f770106b82c4984d38c9033d393'] = 'Introduce la clave secreta del cliente de las credenciales de la aplicación de la cuenta de prueba de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_450e2248dad7a152379bf016310e1eba'] = 'ID de comerciante en vivo';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3058efc14b28f688630f4e6770db5f03'] = 'Introduce el ID de comerciante de tu cuenta activa de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c916854e86ef605147fce41d400b6d74'] = 'Correo electrónico de cuenta en vivo';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_05e0b13ee68a1adcd4939da789611213'] = 'Introduce el correo electrónico de tu cuenta PayPal activa.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1087b413bc531d99ee4deb93e280bfed'] = 'ID de cliente en vivo';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dfa5a074df3ad0ca4018a93243fcce1e'] = 'Introduce el ID de cliente de las credenciales de la aplicación de cuenta real de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b75793dc0a1d8225b39b8be4392339'] = 'Secreto del cliente en vivo';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1382bf9075c663adbf10818ed4789234'] = 'Introduce la clave secreta del cliente de las credenciales de la aplicación de tu cuenta real de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_783901fa167d90d82463e71da67c5e52'] = 'La protección al vendedor de PayPal no es aplicable.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c9cc8cce247e49bae79f15173ce97354'] = 'Ahorrar';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a1c0702a8ce0c1562b372b93b5b8ae70'] = 'Ingrese el ID del comerciante.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_5f8d20654b3683fd837ad6766a99b388'] = 'Se ha proporcionado un ID de comerciante no válido.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_451ad04779375f902c3c9de28f096f42'] = 'Por favor, introduzca el correo electrónico de la cuenta.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a23555edc4d09483a2d5d84478a6e8d3'] = 'Por favor, introduzca un correo electrónico válido para su cuenta.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_d78b4ac6843d2634c46a59c2d0c2629d'] = 'Por favor, introduzca el ID de cliente.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3640405a6244a23f537de55975337bf3'] = 'Introduzca la clave secreta del cliente.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_89493d1e532e6577510bbd93052bf20c'] = 'El pagador inició una disputa con PayPal por este pago capturado.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_9c28e950fb310ee005da61698456bc61'] = 'Los fondos retenidos fueron revertidos en respuesta a la disputa presentada por el pagador con el emisor del instrumento financiero utilizado para efectuar dicho pago.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_e2740ccb963c88d2739ee7ff5d493235'] = 'El pagador realizó el pago mediante un cheque electrónico que aún no se ha hecho efectivo.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_4e3da671b7e244adc46f9093e150fd99'] = 'Acceda a su cuenta en línea. En la sección **Resumen de la cuenta**, acepte o rechace este pago.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_f3d713097a36e0a9f589755465883f91'] = 'No se puede proporcionar ninguna otra razón específica. Para obtener más información sobre este pago, visite su cuenta en línea o póngase en contacto con PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_04263f8fe176af4cd42d9756fc136cfe'] = 'El pago recibido está pendiente de revisión manual.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_c343691c63a475e04acf19b98945bc59'] = 'El beneficiario aún no ha configurado las preferencias de recepción adecuadas para su cuenta. Para obtener más información sobre cómo aceptar o rechazar este pago, visite su cuenta en línea. Este motivo se suele ofrecer en situaciones como cuando la moneda del pago recibido es diferente de la moneda principal de la cuenta del beneficiario.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_71013ee01f1a31c0310bcf4a91162c29'] = 'Los fondos retenidos fueron devueltos.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_a4656378d78c3d73b354ddc0d4dabe18'] = 'El pagador debe enviar los fondos para este pago capturado. Este código generalmente aparece para transferencias electrónicas de fondos manuales.';
$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_1bca65212e4eba1b64766eeb66091af2'] = 'El beneficiario no tiene una cuenta de PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_53c3196bca5dde9b71e5be8287ae9cde'] = 'La cuenta de PayPal del beneficiario no está verificada';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_a7a37ae71b70fe671308691cc6fe03dc'] = 'Transacciones PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Pedir Referencia';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_55307c995094996234479b33fbc16bd1'] = 'Referencia de pedido en QloApps de la transacción de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_53c3196bca5dde9b71e5be8287ae9cde'] = 'La cuenta de PayPal del beneficiario no está verificada.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_a7a37ae71b70fe671308691cc6fe03dc'] = 'Transacciones de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Referencia del pedido';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_55307c995094996234479b33fbc16bd1'] = 'Referencia del pedido en QloApps de la transacción de PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'ID de transacción de PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_dae74f84a69dab4b8e04999f2460febf'] = 'Id de la transacción de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_dae74f84a69dab4b8e04999f2460febf'] = 'ID de la transacción de PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2763b4242763cbee7190de46d45d204f'] = 'Total de la transacción';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_e8453b7e2a7ccf2edeae228682a61b8d'] = 'Importe total pagado en la transacción de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_e8453b7e2a7ccf2edeae228682a61b8d'] = 'Importe total pagado en la transacción de PayPal.';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ce26601dac0dea138b7295f02b7620a7'] = 'Cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_41a9d5e195648f50143f1c1abf5e00e6'] = 'Cliente en las QloApps que realizó la transacción de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_41a9d5e195648f50143f1c1abf5e00e6'] = 'Cliente de QloApps que realizó una transacción con PayPal.';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ec53a8c4f07baed5d8825072c89799be'] = 'Estado';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2ea78fadfafeae47ad786c288667eadf'] = 'Estado de pago';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2ea78fadfafeae47ad786c288667eadf'] = 'Estado del pago';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_3516529c1d87f5fde62d6841140f5dc0'] = 'Estado actual de la transacción de PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6fbc355a02359656f1e4540d58b784e1'] = 'Fecha de orden';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6fbc355a02359656f1e4540d58b784e1'] = 'Fecha del pedido';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_168f21218c30dcc245dc1c62c103cb7b'] = 'Fecha de creación del pedido.';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_630f6dc397fe74e52d5189e2c80f282b'] = 'Volver a la lista';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2a43821ec21eadc4073fc65dc35d2198'] = 'Tipo de reembolso no válido.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_4e7f26d58027e5f9611cc5fe9d901e06'] = 'Monto de reembolso no válido.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_5eaf60217767a2ad1e30d36dc3a1c12c'] = 'Ingrese un motivo de reembolso válido (solo se permiten caracteres alfanuméricos).';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ee4f91ae6dc5a35a0060efa164cb65d9'] = 'Monto de reembolso no válido. Max. la cantidad disponible para reembolso es';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6a8b1040e75c9723eef0a783ffc0e1d2'] = 'El reembolso ya está hecho para esta transacción.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_4e7f26d58027e5f9611cc5fe9d901e06'] = 'Importe de reembolso no válido.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_5eaf60217767a2ad1e30d36dc3a1c12c'] = 'Introduzca un motivo de reembolso válido (solo se permiten caracteres alfanuméricos).';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ee4f91ae6dc5a35a0060efa164cb65d9'] = 'Importe de reembolso no válido. El importe máximo disponible para reembolso es';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6a8b1040e75c9723eef0a783ffc0e1d2'] = 'El reembolso de esta transacción ya se ha realizado.';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_446b416d535ed3f547fcd653dc11d49c'] = 'Solicitud no válida';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Esta forma de pago no está disponible.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Este método de pago no está disponible.';
$_MODULE['<{qlopaypalcommerce}prestashop>payment_2b46a852749d321a4c6eafa3b36b643c'] = 'Pago con PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>view_78170aac364ebe8527577b742dc2111d'] = 'Detalles de la transacción de PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>view_34c15b4659b2241667e4c5d534270a17'] = 'Entorno de pago';
@@ -75,48 +79,64 @@ $_MODULE['<{qlopaypalcommerce}prestashop>view_756d97bb256b8580d4d71ee0c547804e']
$_MODULE['<{qlopaypalcommerce}prestashop>view_6f097b8feb2af129c8f74c786c130c1c'] = 'ID de referencia de PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>view_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'ID de transacción de PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>view_157c928dae48d88d19fb2ced2afbdd71'] = 'ID de pedido de PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_fdabf4e63a3cc1fe987269ff4e629148'] = 'cantidad de transacción';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_e98b5a6351fecb55b2f890686f31856d'] = 'Referencia de pedido de QloApps';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_fdabf4e63a3cc1fe987269ff4e629148'] = 'Importe de la transacción';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Referencia del pedido';
$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea989f83006e233627987293f4bde0a'] = 'Nombre del cliente';
$_MODULE['<{qlopaypalcommerce}prestashop>view_54945fdafec2c65f0f5561d65b165f1a'] = 'Correo electrónico del cliente';
$_MODULE['<{qlopaypalcommerce}prestashop>view_475007c00d7c166cca01a44ecfd068ff'] = 'Ver cliente';
$_MODULE['<{qlopaypalcommerce}prestashop>view_4351cfebe4b61d8aa5efa1d020710005'] = 'Vista';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea78fadfafeae47ad786c288667eadf'] = 'Estado de pago';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea78fadfafeae47ad786c288667eadf'] = 'Estado del pago';
$_MODULE['<{qlopaypalcommerce}prestashop>view_8f7afecbc8fbc4cd0f50a57d1172482e'] = 'TERMINADO';
$_MODULE['<{qlopaypalcommerce}prestashop>view_31738cd694667ccdfa2cbc65249de5cc'] = 'Fecha de pago';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_580d87d5c5121696825f17708b1ec065'] = 'Monto total reembolsado';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_580d87d5c5121696825f17708b1ec065'] = 'Importe total reembolsado';
$_MODULE['<{qlopaypalcommerce}prestashop>view_8b123a0f5d61720a4273bc4ed1d613a3'] = 'Transacción de reembolso';
$_MODULE['<{qlopaypalcommerce}prestashop>view_a3a13394565fb6956d6948a1dbb8fe3f'] = 'Importe total reembolsado';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_9d9dca90e919bd4c8febf55ea7a25b5f'] = 'Monto total disponible para reembolsar';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_51890b292429265077afcc0b2bb6f34a'] = 'Seleccione el tipo de reembolso. Seleccione reembolso parcial para reembolsar el monto parcial de la transacción. Seleccione reembolso completo para reembolsar el monto total de la transacción.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_9d9dca90e919bd4c8febf55ea7a25b5f'] = 'Importe total disponible para reembolso';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_51890b292429265077afcc0b2bb6f34a'] = 'Seleccione el tipo de reembolso. Seleccione reembolso parcial para reembolsar una parte del importe de la transacción. Seleccione reembolso total para reembolsar el importe total de la transacción.';
$_MODULE['<{qlopaypalcommerce}prestashop>view_d8fb839f1db11646b85354c3fb50fda3'] = 'Tipo de reembolso';
$_MODULE['<{qlopaypalcommerce}prestashop>view_4f5a217b333e276be931951be6dc28f0'] = 'Seleccione el tipo de reembolso';
$_MODULE['<{qlopaypalcommerce}prestashop>view_abcec07843d3ec02783b27587560f85f'] = 'Reembolso completo';
$_MODULE['<{qlopaypalcommerce}prestashop>view_c985a711556e2edf5cac28dfbdb43ff0'] = 'Reembolso parcial';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_84bca5dc34bb0d1244a9e0f323878665'] = 'Ingrese el monto que desea reembolsar del monto de la transacción.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_b782d4ff61550d7e8cdee4cf70a03788'] = 'cantidad devuelta';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_6bbeabf389367bc93090db6dd0c13c4e'] = 'máx.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_85689c24167c4690a0e346c46a17598c'] = 'Ingrese un comentario para este reembolso.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_97d8f33367ecaeee79d5255b447c8827'] = 'Reembolso Observación';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_84bca5dc34bb0d1244a9e0f323878665'] = 'Ingrese la cantidad que desea reembolsar del monto de la transacción.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_b782d4ff61550d7e8cdee4cf70a03788'] = 'Importe del reembolso';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_6bbeabf389367bc93090db6dd0c13c4e'] = 'máximo.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_85689c24167c4690a0e346c46a17598c'] = 'Escriba un comentario para este reembolso.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_97d8f33367ecaeee79d5255b447c8827'] = 'Observación sobre el reembolso';
$_MODULE['<{qlopaypalcommerce}prestashop>view_76f0ed934de85cc7131910b32ede7714'] = 'Reembolso';
$_MODULE['<{qlopaypalcommerce}prestashop>view_072ab77c58ea38de4e3272c3eed624c1'] = 'Lista de reembolsos';
$_MODULE['<{qlopaypalcommerce}prestashop>view_88427ec035734b45aae9f7d8859a5008'] = 'ID de transacción';
$_MODULE['<{qlopaypalcommerce}prestashop>view_b2f40690858b404ed10e62bdf422c704'] = 'Cantidad';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a1fa27779242b4902f7ae3bdd5c6d508'] = 'Escribe';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a1fa27779242b4902f7ae3bdd5c6d508'] = 'Tipo';
$_MODULE['<{qlopaypalcommerce}prestashop>view_ec53a8c4f07baed5d8825072c89799be'] = 'Estado';
$_MODULE['<{qlopaypalcommerce}prestashop>view_44749712dbec183e983dcd78a7736c41'] = 'Fecha';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a207494d393a4f4909f746fd24440440'] = 'Aún no se han creado reembolsos.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_e3bc22b32f4abd925670253972326260'] = 'Importe total reembolsado: ';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_7b12dad517fd9056aabf8099a8173ddf'] = 'Su pago no se ha realizado debido a los siguientes motivos:';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_91921ada405fd6ba65dff028df047cb6'] = 'Observación';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a207494d393a4f4909f746fd24440440'] = 'Aún no se han generado reembolsos.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_e3bc22b32f4abd925670253972326260'] = 'Importe total reembolsado:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_7b12dad517fd9056aabf8099a8173ddf'] = 'Su pago ha fallado por el siguiente motivo:';
$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_3d9f514d46849760ef1b1412e314fd99'] = 'Error:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_0d6779532e0735f6a9b05723ab191bc3'] = 'Error de descripción:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_569fd05bdafa1712c4f6be5b153b8418'] = 'otros métodos de pago';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_cancel_ack_0e1b6078789badcbfae8640288a46f0f'] = 'Ha cancelado el pago mediante PayPal. Puede volver a intentarlo con PayPal o probar con otro método de pago.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Tu pedido en% s está completo.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_cd44f47a868e5e42fa1a23b775504490'] = 'Cantidad total pagada';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_0d6779532e0735f6a9b05723ab191bc3'] = 'Descripción del error:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_569fd05bdafa1712c4f6be5b153b8418'] = 'Otros métodos de pago';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_cancel_ack_0e1b6078789badcbfae8640288a46f0f'] = 'Has cancelado el pago con PayPal. Puedes volver a intentarlo con PayPal o probar con otro método de pago.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Su pedido en %s se ha completado.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_cd44f47a868e5e42fa1a23b775504490'] = 'Importe total pagado';
$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_19c419a8a4f1cd621853376a930a2e24'] = 'Se ha enviado un correo electrónico con esta información.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_30163d8fc3068e8297e7ab5bf32aec87'] = 'Su pedido se enviará lo antes posible.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_ca7e41a658753c87973936d7ce2429a8'] = 'Si tiene preguntas, comentarios o inquietudes, comuníquese con nuestro';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_30163d8fc3068e8297e7ab5bf32aec87'] = 'Su pedido será enviado lo antes posible.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_ca7e41a658753c87973936d7ce2429a8'] = 'Si tiene preguntas, comentarios o inquietudes, póngase en contacto con nosotros.';
$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_66fcf4c223bbf4c7c886d4784e1f62e4'] = 'equipo experto de atención al cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_7c2ed2f8a5fc3c48f2d49196f96b34b1'] = 'Notamos un problema con su pago. Póngase en contacto con nuestro';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_7c2ed2f8a5fc3c48f2d49196f96b34b1'] = 'Hemos detectado un problema con su pago. Por favor, póngase en contacto con nosotros.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_17a17ba93e6ac0192bd563905e87538d'] = 'Paga utilizando las opciones de pago de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_644253cd300d73471cf86296d532b964'] = 'Paga con PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>payment_25e8f2fd2871c8423bbe4e254066cd98'] = 'Espere por favor...';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dba5abcd5b8bb0ee23a6bde15a6e5fde'] = 'Pago de QloApps PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1639a5f6b16f8d4a04393dbdff0e05f6'] = 'Un negocio global instantáneo.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dd5e9bb870ec616039f0fe9f2bd4726b'] = 'Una integración para todas sus necesidades de pago en línea.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e654f7a86a4458b9cd662267e0f29b52'] = 'Beneficios';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_229a7ec501323b94db7ff3157a7623c9'] = 'Identificación del comerciante';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_daa9d1b5682c462e8fc8585bb4cf868c'] = 'Ingrese el ID de comerciante de su cuenta PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_275f5257af70b08ed6def799bfa214b3'] = 'Cuenta de email';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_9b022ec729030a4e40c533c61668d128'] = 'Ingrese el correo electrónico de la cuenta de PayPal de su cuenta de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_76525f0f34b48475e5ca33f71d296f3b'] = 'Identificación del cliente';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_21fb87c3b83156a1c9e7c51239705335'] = 'Ingrese el ID de cliente de las credenciales de la aplicación de la cuenta de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_734082edf44417dd19cc65943aa65c36'] = 'Secreto del cliente';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_92718280c77bfa861693c57bad5a0632'] = 'Ingrese el secreto del cliente de las credenciales de la aplicación de la cuenta de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_e98b5a6351fecb55b2f890686f31856d'] = 'Referencia de pedido de QloApps';
diff --git a/modules/qlopaypalcommerce/translations/gl.php b/modules/qlopaypalcommerce/translations/gl.php
index 4486b68b7..19c74fba0 100644
--- a/modules/qlopaypalcommerce/translations/gl.php
+++ b/modules/qlopaypalcommerce/translations/gl.php
@@ -2,22 +2,135 @@
global $_MODULE;
$_MODULE = array();
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dba5abcd5b8bb0ee23a6bde15a6e5fde'] = 'QloApps PayPal Checkout';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dba5abcd5b8bb0ee23a6bde15a6e5fde'] = 'Pagamento de PayPal de QloApps';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1639a5f6b16f8d4a04393dbdff0e05f6'] = 'Un negocio global instantáneo.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dd5e9bb870ec616039f0fe9f2bd4726b'] = 'Unha integración para todas as necesidades de pago en liña.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dd5e9bb870ec616039f0fe9f2bd4726b'] = 'Unha integración para todas as túas necesidades de pagamento en liña.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e654f7a86a4458b9cd662267e0f29b52'] = 'Beneficios';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e0a9745011703bc991ab1af1f50ccd20'] = 'Permita aos seus clientes unha experiencia de compra perfecta que impulse a conversión e a fidelización.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_af0fd51a752f317a87b2f7b724856034'] = 'Acepte os pagos de PayPal con incorporación simplificada, integración adaptable e fácil configuración da conta.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b50f4dec6df62993204153f8d5db2c'] = 'Acceso a clientes de 377M + PayPal de todo o mundo *, con soporte en moeda local para unha mellor xestión do diñeiro.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_cb47de9d9350a9025c8c3b657c8c8268'] = 'Tranquilidade para vostede e os seus clientes con protección do comprador e vendedor nas vendas subvencionables.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_8332b9ae4d8931da4a311f410a232619'] = 'Resultado do cuarto trimestre de PayPal 2020';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1e4fe71e24592a98260048fe05cbbb5b'] = 'Debe configurarse a identificación de comerciante de PayPal, o correo electrónico, a identificación de cliente e o segredo.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a02758d758e8bec77a33d7f392eb3f8a'] = 'Non se configurou ningunha moeda para este módulo.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_afcae56aeb45bbff848348abf4824b44'] = 'Configuración de pagamento PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_116e78f6c1c4b4f66a57192817242e35'] = 'Entorno de transacción';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_2652eec977dcb2a5aea85f5bec235b05'] = 'Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e0a9745011703bc991ab1af1f50ccd20'] = 'Habilita unha experiencia de compra fluída para os teus clientes que impulse a conversión e a fidelización.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_af0fd51a752f317a87b2f7b724856034'] = 'Acepta pagamentos de PayPal cunha incorporación simplificada, integración adaptable e configuración de conta sinxela.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b50f4dec6df62993204153f8d5db2c'] = 'Acceso a máis de 377 millóns de clientes de PayPal en todo o mundo*, con compatibilidade coa moeda local para unha mellor xestión do diñeiro.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_cb47de9d9350a9025c8c3b657c8c8268'] = 'Tranquilidade para vostede e os seus clientes coa protección do comprador e do vendedor nas vendas que cumpren os requisitos.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_8332b9ae4d8931da4a311f410a232619'] = 'Resultados do cuarto trimestre de PayPal de 2020';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1e4fe71e24592a98260048fe05cbbb5b'] = 'Débense configurar o ID de comerciante, o correo electrónico, o ID de cliente e o segredo de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a02758d758e8bec77a33d7f392eb3f8a'] = 'Non se estableceu ningunha moeda para este módulo.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_afcae56aeb45bbff848348abf4824b44'] = 'Configuración de pagamento de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_116e78f6c1c4b4f66a57192817242e35'] = 'Ambiente de transaccións';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_2652eec977dcb2a5aea85f5bec235b05'] = 'Zona de probas';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_756d97bb256b8580d4d71ee0c547804e'] = 'Produción';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_bb6e852329aacf2cc839e01ab1ce1773'] = 'Selecciona o entorno de pago de PayPal ou sandbox ou produción. Podes obter transaccións reais só na produción, para probas, usa sandbox.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_bb6e852329aacf2cc839e01ab1ce1773'] = 'Selecciona o entorno de pagamento de PayPal, xa sexa sandbox ou produción. Só podes obter transaccións reais en produción; para probas, usa sandbox.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_ed4f8785248e2d9a8a8b25e5c483551a'] = 'ID de comerciante de Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_6d132ffd3d699649441bdc627dd57eba'] = 'Introduza o ID de comerciante da súa conta de probas de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_36808d0f8a32391ba62716d9831040e5'] = 'Correo electrónico da conta de probas';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_ff8336737d5f067b6c11724bd6fc944e'] = 'Introduce o correo electrónico da conta de PayPal da túa conta de probas de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a0bd7d42b20f8ca0c6f28bdd30a1af1f'] = 'ID do cliente de Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e7b65a83fa18a3396a4b140483e6f288'] = 'Introduza o ID de cliente das credenciais da aplicación da conta de probas de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_9af7eae52a08a132e079c3e910bb2cbe'] = 'Segredo do cliente de Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_023d4f770106b82c4984d38c9033d393'] = 'Introduza o segredo do cliente das credenciais da aplicación de conta de probas de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_450e2248dad7a152379bf016310e1eba'] = 'ID de comerciante en directo';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3058efc14b28f688630f4e6770db5f03'] = 'Introduza o ID de comerciante da súa conta real de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c916854e86ef605147fce41d400b6d74'] = 'Correo electrónico da conta real';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_05e0b13ee68a1adcd4939da789611213'] = 'Introduza o correo electrónico da conta de PayPal da súa conta real de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1087b413bc531d99ee4deb93e280bfed'] = 'ID de cliente en directo';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dfa5a074df3ad0ca4018a93243fcce1e'] = 'Introduza o ID de cliente das credenciais da aplicación de conta en directo de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b75793dc0a1d8225b39b8be4392339'] = 'Segredo do cliente en directo';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1382bf9075c663adbf10818ed4789234'] = 'Introduza o segredo do cliente das credenciais da aplicación de conta real de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_783901fa167d90d82463e71da67c5e52'] = 'Protección ao vendedor de PayPal non aplicable';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c9cc8cce247e49bae79f15173ce97354'] = 'Gardar';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a1c0702a8ce0c1562b372b93b5b8ae70'] = 'Introduza o ID do comerciante';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_5f8d20654b3683fd837ad6766a99b388'] = 'O ID de comerciante proporcionado non é válido.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_451ad04779375f902c3c9de28f096f42'] = 'Introduza o correo electrónico da conta';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a23555edc4d09483a2d5d84478a6e8d3'] = 'Introduza un correo electrónico de conta válido';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_d78b4ac6843d2634c46a59c2d0c2629d'] = 'Introduza o ID do cliente';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3640405a6244a23f537de55975337bf3'] = 'Introduza o segredo do cliente';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_89493d1e532e6577510bbd93052bf20c'] = 'O pagador iniciou unha disputa con PayPal por este pago capturado.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_9c28e950fb310ee005da61698456bc61'] = 'Os fondos capturados foron revertidos en resposta a unha disputa por parte do pagador sobre este pagamento capturado co emisor do instrumento financeiro utilizado para pagar este pagamento capturado.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_e2740ccb963c88d2739ee7ff5d493235'] = 'O pagador pagou cun cheque electrónico que aínda non foi compensado.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_4e3da671b7e244adc46f9093e150fd99'] = 'Visita a túa conta en liña. Na **Visión xeral da conta**, acepta e rexeita este pago.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_f3d713097a36e0a9f589755465883f91'] = 'Non se pode proporcionar ningunha razón específica adicional. Para obter máis información sobre este pago capturado, visite a súa conta en liña ou póñase en contacto con PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_04263f8fe176af4cd42d9756fc136cfe'] = 'O pagamento capturado está pendente de revisión manual.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_c343691c63a475e04acf19b98945bc59'] = 'O beneficiario aínda non configurou as preferencias de recepción axeitadas para a súa conta. Para obter máis información sobre como aceptar ou rexeitar este pago, visita a túa conta en liña. Este motivo adoita ofrecerse en situacións como cando a moeda do pago capturado é diferente da moeda principal de tenza do beneficiario.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_71013ee01f1a31c0310bcf4a91162c29'] = 'Os fondos capturados foron devoltos.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_a4656378d78c3d73b354ddc0d4dabe18'] = 'O pagador debe enviar os fondos para este pago capturado. Este código xeralmente aparece para as transferencias electrónicas de fondos manuais.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_1bca65212e4eba1b64766eeb66091af2'] = 'O beneficiario non ten unha conta de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_53c3196bca5dde9b71e5be8287ae9cde'] = 'A conta de PayPal do beneficiario non está verificada';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_a7a37ae71b70fe671308691cc6fe03dc'] = 'Transaccións de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Referencia da orde';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_55307c995094996234479b33fbc16bd1'] = 'Referencia da orde en QloApps da transacción de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'ID de transacción de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_dae74f84a69dab4b8e04999f2460febf'] = 'ID da transacción de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2763b4242763cbee7190de46d45d204f'] = 'Total da transacción';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_e8453b7e2a7ccf2edeae228682a61b8d'] = 'Importe total pagado na transacción de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ce26601dac0dea138b7295f02b7620a7'] = 'Cliente';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_41a9d5e195648f50143f1c1abf5e00e6'] = 'Cliente nas QloApps que realizou unha transacción de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ec53a8c4f07baed5d8825072c89799be'] = 'Estado';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2ea78fadfafeae47ad786c288667eadf'] = 'Estado do pago';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_3516529c1d87f5fde62d6841140f5dc0'] = 'Estado actual da transacción de PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6fbc355a02359656f1e4540d58b784e1'] = 'Data da orde';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_168f21218c30dcc245dc1c62c103cb7b'] = 'Data de creación da orde.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_630f6dc397fe74e52d5189e2c80f282b'] = 'Volver á lista';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2a43821ec21eadc4073fc65dc35d2198'] = 'Tipo de reembolso non válido.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_4e7f26d58027e5f9611cc5fe9d901e06'] = 'Importe do reembolso non válido.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_5eaf60217767a2ad1e30d36dc3a1c12c'] = 'Introduza un motivo válido para o reembolso (só se permiten caracteres alfanuméricos).';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ee4f91ae6dc5a35a0060efa164cb65d9'] = 'Importe do reembolso non válido. O importe máximo dispoñible para o reembolso é';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6a8b1040e75c9723eef0a783ffc0e1d2'] = 'Xa se realizou o reembolso desta transacción.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_446b416d535ed3f547fcd653dc11d49c'] = 'Solicitude non válida';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Este método de pago non está dispoñible.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_2b46a852749d321a4c6eafa3b36b643c'] = 'Pagamento de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_78170aac364ebe8527577b742dc2111d'] = 'Detalles da transacción de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_34c15b4659b2241667e4c5d534270a17'] = 'Ambiente de pagamento';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2652eec977dcb2a5aea85f5bec235b05'] = 'Zona de probas';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_756d97bb256b8580d4d71ee0c547804e'] = 'Produción';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_6f097b8feb2af129c8f74c786c130c1c'] = 'ID de referencia de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'ID de transacción de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_157c928dae48d88d19fb2ced2afbdd71'] = 'ID do pedido de PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_fdabf4e63a3cc1fe987269ff4e629148'] = 'Importe da transacción';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Referencia da orde';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea989f83006e233627987293f4bde0a'] = 'Nome do cliente';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_54945fdafec2c65f0f5561d65b165f1a'] = 'Correo electrónico do cliente';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_475007c00d7c166cca01a44ecfd068ff'] = 'Ver cliente';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_4351cfebe4b61d8aa5efa1d020710005'] = 'Vista';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea78fadfafeae47ad786c288667eadf'] = 'Estado do pago';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_8f7afecbc8fbc4cd0f50a57d1172482e'] = 'COMPLETADO';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_31738cd694667ccdfa2cbc65249de5cc'] = 'Data de pagamento';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_580d87d5c5121696825f17708b1ec065'] = 'Importe total reembolsado';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_8b123a0f5d61720a4273bc4ed1d613a3'] = 'Transacción de reembolso';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a3a13394565fb6956d6948a1dbb8fe3f'] = 'Importe total reembolsado';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_9d9dca90e919bd4c8febf55ea7a25b5f'] = 'Importe total dispoñible para reembolsar';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_51890b292429265077afcc0b2bb6f34a'] = 'Selecciona o tipo de reembolso. Selecciona reembolso parcial para reembolsar unha cantidade parcial da transacción. Selecciona reembolso completo para reembolsar o importe total da transacción.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_d8fb839f1db11646b85354c3fb50fda3'] = 'Tipo de reembolso';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_4f5a217b333e276be931951be6dc28f0'] = 'Seleccionar tipo de reembolso';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_abcec07843d3ec02783b27587560f85f'] = 'Reembolso completo';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_c985a711556e2edf5cac28dfbdb43ff0'] = 'Reembolso parcial';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_84bca5dc34bb0d1244a9e0f323878665'] = 'Introduza a cantidade que desexa reembolsar do importe da transacción.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_b782d4ff61550d7e8cdee4cf70a03788'] = 'Importe do reembolso';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_6bbeabf389367bc93090db6dd0c13c4e'] = 'máx.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_85689c24167c4690a0e346c46a17598c'] = 'Introduza un comentario para este reembolso.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_97d8f33367ecaeee79d5255b447c8827'] = 'Observación de reembolso';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_76f0ed934de85cc7131910b32ede7714'] = 'Reembolso';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_072ab77c58ea38de4e3272c3eed624c1'] = 'Lista de reembolsos';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_88427ec035734b45aae9f7d8859a5008'] = 'ID da transacción';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_b2f40690858b404ed10e62bdf422c704'] = 'Cantidade';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a1fa27779242b4902f7ae3bdd5c6d508'] = 'Tipo';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_ec53a8c4f07baed5d8825072c89799be'] = 'Estado';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_44749712dbec183e983dcd78a7736c41'] = 'Data';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_91921ada405fd6ba65dff028df047cb6'] = 'Observación';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a207494d393a4f4909f746fd24440440'] = 'Aínda non se crearon reembolsos.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_e3bc22b32f4abd925670253972326260'] = 'Importe total reembolsado:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_7b12dad517fd9056aabf8099a8173ddf'] = 'O teu pago fallou debido ao seguinte motivo:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_3d9f514d46849760ef1b1412e314fd99'] = 'Erro:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_0d6779532e0735f6a9b05723ab191bc3'] = 'Descrición do erro:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_569fd05bdafa1712c4f6be5b153b8418'] = 'Outros métodos de pago';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_cancel_ack_0e1b6078789badcbfae8640288a46f0f'] = 'Cancelaches o pago con PayPal. Podes intentalo de novo con PayPal ou probar un método de pago diferente.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Completouse o teu pedido en %s.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_cd44f47a868e5e42fa1a23b775504490'] = 'Importe total pagado';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_19c419a8a4f1cd621853376a930a2e24'] = 'Enviouse un correo electrónico con esta información.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_30163d8fc3068e8297e7ab5bf32aec87'] = 'O teu pedido enviarase o antes posible.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_ca7e41a658753c87973936d7ce2429a8'] = 'Se tes algunha pregunta, comentario ou preocupación, ponte en contacto co noso';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_66fcf4c223bbf4c7c886d4784e1f62e4'] = 'equipo experto de atención ao cliente';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_7c2ed2f8a5fc3c48f2d49196f96b34b1'] = 'Detectámos un problema co teu pagamento. Ponte en contacto co noso';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_17a17ba93e6ac0192bd563905e87538d'] = 'Paga usando as opcións de pagamento de Paypal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_644253cd300d73471cf86296d532b964'] = 'Pagar con Paypal';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_25e8f2fd2871c8423bbe4e254066cd98'] = 'Agarde, por favor...';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_229a7ec501323b94db7ff3157a7623c9'] = 'Identificación de comerciante';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_daa9d1b5682c462e8fc8585bb4cf868c'] = 'Introduza o ID de comerciante da súa conta PayPal.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_275f5257af70b08ed6def799bfa214b3'] = 'Correo electrónico da conta';
@@ -26,97 +139,4 @@ $_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_76525f0f34b48475e5ca3
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_21fb87c3b83156a1c9e7c51239705335'] = 'Introduza o ID de cliente das credenciais da aplicación de conta PayPal.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_734082edf44417dd19cc65943aa65c36'] = 'Secreto do cliente';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_92718280c77bfa861693c57bad5a0632'] = 'Introduza o segredo do cliente desde as credenciais da aplicación de conta PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_783901fa167d90d82463e71da67c5e52'] = 'Protección do vendedor de PayPal non aplicable';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c9cc8cce247e49bae79f15173ce97354'] = 'Gardar';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a1c0702a8ce0c1562b372b93b5b8ae70'] = 'Introduza o identificador de comerciante';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_5f8d20654b3683fd837ad6766a99b388'] = 'A identificación de comerciante non foi válida.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_451ad04779375f902c3c9de28f096f42'] = 'Introduza o correo electrónico da conta';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a23555edc4d09483a2d5d84478a6e8d3'] = 'Introduza o correo electrónico da conta válido';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_d78b4ac6843d2634c46a59c2d0c2629d'] = 'Introduza o ID de cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3640405a6244a23f537de55975337bf3'] = 'Introduza o segredo do cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_89493d1e532e6577510bbd93052bf20c'] = 'O pagador iniciou unha disputa por este pago capturado con PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_9c28e950fb310ee005da61698456bc61'] = 'Os fondos capturados invertíronse en resposta a que o pagador disputase este pago capturado co emisor do instrumento financeiro usado para pagar este pago capturado.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_e2740ccb963c88d2739ee7ff5d493235'] = 'O pagador pagou por un eCheck que aínda non liquidou.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_4e3da671b7e244adc46f9093e150fd99'] = 'Visita a túa conta en liña. Na súa ** Visión xeral da conta **, acepte e denegue este pago.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_f3d713097a36e0a9f589755465883f91'] = 'Non se pode proporcionar ningún motivo específico adicional. Para obter máis información sobre este pago capturado, visite a súa conta en liña ou contacte con PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_04263f8fe176af4cd42d9756fc136cfe'] = 'O pago capturado está pendente de revisión manual.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_c343691c63a475e04acf19b98945bc59'] = 'O beneficiario aínda non configurou as preferencias de recepción adecuadas para a súa conta. Para obter máis información sobre como aceptar ou denegar este pago, visite a súa conta en liña. Esta razón ofrécese normalmente en escenarios como cando a moeda do pago capturado é diferente da moeda de retención principal do beneficiario.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_71013ee01f1a31c0310bcf4a91162c29'] = 'Os fondos capturados foron devoltos.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_a4656378d78c3d73b354ddc0d4dabe18'] = 'O pagador debe enviar os fondos para este pago capturado. Este código xeralmente aparece para os EFT manuais.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_1bca65212e4eba1b64766eeb66091af2'] = 'O beneficiario non ten unha conta PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_53c3196bca5dde9b71e5be8287ae9cde'] = 'A conta PayPal do beneficiario non está verificada';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_a7a37ae71b70fe671308691cc6fe03dc'] = 'Transaccións PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Referencia da orde';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_55307c995094996234479b33fbc16bd1'] = 'Referencia de pedido en QloApps da transacción PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'ID de transacción PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_dae74f84a69dab4b8e04999f2460febf'] = 'Id da transacción de PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2763b4242763cbee7190de46d45d204f'] = 'Transacción total';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_e8453b7e2a7ccf2edeae228682a61b8d'] = 'Importe total pagado na transacción PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ce26601dac0dea138b7295f02b7620a7'] = 'Cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_41a9d5e195648f50143f1c1abf5e00e6'] = 'Cliente en QloApps que realizou unha transacción con PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ec53a8c4f07baed5d8825072c89799be'] = 'Estado';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2ea78fadfafeae47ad786c288667eadf'] = 'Estado de pagamento';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_3516529c1d87f5fde62d6841140f5dc0'] = 'Estado actual da transacción PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6fbc355a02359656f1e4540d58b784e1'] = 'Data de pedido';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_168f21218c30dcc245dc1c62c103cb7b'] = 'Data de creación da orde.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_630f6dc397fe74e52d5189e2c80f282b'] = 'Volver á lista';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2a43821ec21eadc4073fc65dc35d2198'] = 'Tipo de reembolso non válido.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_4e7f26d58027e5f9611cc5fe9d901e06'] = 'Importe do reembolso non válido.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_5eaf60217767a2ad1e30d36dc3a1c12c'] = 'Insira un motivo de reembolso válido (só se permite o alfanumérico).';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ee4f91ae6dc5a35a0060efa164cb65d9'] = 'Importe do reembolso non válido. Máx. o importe dispoñible para o reembolso é de';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6a8b1040e75c9723eef0a783ffc0e1d2'] = 'Xa se realizou o reembolso por esta transacción.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_446b416d535ed3f547fcd653dc11d49c'] = 'Solicitude non válida';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Este método de pago non está dispoñible.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_2b46a852749d321a4c6eafa3b36b643c'] = 'PayPal Checkout';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_78170aac364ebe8527577b742dc2111d'] = 'Detalles da transacción de PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_34c15b4659b2241667e4c5d534270a17'] = 'Contorno de pagamento';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2652eec977dcb2a5aea85f5bec235b05'] = 'Sandbox';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_756d97bb256b8580d4d71ee0c547804e'] = 'Produción';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_6f097b8feb2af129c8f74c786c130c1c'] = 'ID de referencia de PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'ID de transacción PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_157c928dae48d88d19fb2ced2afbdd71'] = 'ID de pedido de PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_fdabf4e63a3cc1fe987269ff4e629148'] = 'Importe da transacción';
$_MODULE['<{qlopaypalcommerce}prestashop>view_e98b5a6351fecb55b2f890686f31856d'] = 'Referencia de pedidos de QloApps';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea989f83006e233627987293f4bde0a'] = 'Nome do cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_54945fdafec2c65f0f5561d65b165f1a'] = 'Correo electrónico do cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_475007c00d7c166cca01a44ecfd068ff'] = 'Ver cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_4351cfebe4b61d8aa5efa1d020710005'] = 'Ver';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea78fadfafeae47ad786c288667eadf'] = 'Estado de pagamento';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_8f7afecbc8fbc4cd0f50a57d1172482e'] = 'REMATADO';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_31738cd694667ccdfa2cbc65249de5cc'] = 'Data de pagamento';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_580d87d5c5121696825f17708b1ec065'] = 'Importe reembolsado total';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_8b123a0f5d61720a4273bc4ed1d613a3'] = 'Transacción de reembolso';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a3a13394565fb6956d6948a1dbb8fe3f'] = 'Importe total reembolsado';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_9d9dca90e919bd4c8febf55ea7a25b5f'] = 'Importe total dispoñible para reembolsar';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_51890b292429265077afcc0b2bb6f34a'] = 'Selecciona o tipo de reembolso. Seleccione o reembolso parcial para devolver o importe parcial da transacción. Seleccione o reembolso completo para reembolsar o importe total da transacción.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_d8fb839f1db11646b85354c3fb50fda3'] = 'Tipo de reembolso';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_4f5a217b333e276be931951be6dc28f0'] = 'Selecciona o tipo de reembolso';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_abcec07843d3ec02783b27587560f85f'] = 'Reembolso total';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_c985a711556e2edf5cac28dfbdb43ff0'] = 'Reembolso parcial';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_84bca5dc34bb0d1244a9e0f323878665'] = 'Introduza o importe que desexa reembolsar do importe da transacción.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_b782d4ff61550d7e8cdee4cf70a03788'] = 'Importe do reembolso';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_6bbeabf389367bc93090db6dd0c13c4e'] = 'máx.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_85689c24167c4690a0e346c46a17598c'] = 'Introduce un comentario para este reembolso.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_97d8f33367ecaeee79d5255b447c8827'] = 'Observación de reembolso';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_76f0ed934de85cc7131910b32ede7714'] = 'Reembolso';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_072ab77c58ea38de4e3272c3eed624c1'] = 'Lista de reembolsos';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_88427ec035734b45aae9f7d8859a5008'] = 'ID de transacción';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_b2f40690858b404ed10e62bdf422c704'] = 'Cantidade';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a1fa27779242b4902f7ae3bdd5c6d508'] = 'Tipo';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_ec53a8c4f07baed5d8825072c89799be'] = 'Estado';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_44749712dbec183e983dcd78a7736c41'] = 'Data';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a207494d393a4f4909f746fd24440440'] = 'Aínda non se crearon devolucións.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_e3bc22b32f4abd925670253972326260'] = 'Importe total reembolsado: ';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_7b12dad517fd9056aabf8099a8173ddf'] = 'Fallou o pago debido ao seguinte motivo:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_3d9f514d46849760ef1b1412e314fd99'] = 'Erro:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_0d6779532e0735f6a9b05723ab191bc3'] = 'Descrición do erro:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_569fd05bdafa1712c4f6be5b153b8418'] = 'Outros métodos de pagamento';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_cancel_ack_0e1b6078789badcbfae8640288a46f0f'] = 'Cancelaches o pago por PayPal. Podes tentalo de novo con PayPal ou probar outro método de pago.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'O teu pedido en% s completouse.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_cd44f47a868e5e42fa1a23b775504490'] = 'Importe total pagado';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_19c419a8a4f1cd621853376a930a2e24'] = 'Enviouse un correo electrónico con esta información.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_30163d8fc3068e8297e7ab5bf32aec87'] = 'O seu pedido enviarase canto antes.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_ca7e41a658753c87973936d7ce2429a8'] = 'Se tes dúbidas, comentarios ou dúbidas, ponte en contacto co noso';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_66fcf4c223bbf4c7c886d4784e1f62e4'] = 'equipo de atención ao cliente experto';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_7c2ed2f8a5fc3c48f2d49196f96b34b1'] = 'Detectamos un problema co teu pago. Póñase en contacto co noso';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_25e8f2fd2871c8423bbe4e254066cd98'] = 'Agarde por favor ...';
diff --git a/modules/qlopaypalcommerce/translations/it.php b/modules/qlopaypalcommerce/translations/it.php
index 2979d0181..b5a713ce4 100644
--- a/modules/qlopaypalcommerce/translations/it.php
+++ b/modules/qlopaypalcommerce/translations/it.php
@@ -2,22 +2,135 @@
global $_MODULE;
$_MODULE = array();
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dba5abcd5b8bb0ee23a6bde15a6e5fde'] = 'Checkout PayPal di QloApps';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1639a5f6b16f8d4a04393dbdff0e05f6'] = 'Un business globale istantaneo.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dba5abcd5b8bb0ee23a6bde15a6e5fde'] = 'Pagamento tramite PayPal con QloApps';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1639a5f6b16f8d4a04393dbdff0e05f6'] = 'Un\'attività globale immediata.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dd5e9bb870ec616039f0fe9f2bd4726b'] = 'Un\'unica integrazione per tutte le tue esigenze di pagamento online.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e654f7a86a4458b9cd662267e0f29b52'] = 'Benefici';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e0a9745011703bc991ab1af1f50ccd20'] = 'Consenti un\'esperienza di acquisto senza interruzioni per i tuoi clienti che promuove conversioni e fedeltà.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_af0fd51a752f317a87b2f7b724856034'] = 'Accetta pagamenti PayPal con onboarding semplificato, integrazione adattabile e facile configurazione dell\'account.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b50f4dec6df62993204153f8d5db2c'] = 'Accesso a oltre 377 milioni di clienti PayPal in tutto il mondo *, con supporto in valuta locale per una migliore gestione del denaro.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_cb47de9d9350a9025c8c3b657c8c8268'] = 'Tranquillità per te e i tuoi clienti grazie alla protezione dell\'acquirente e del venditore sulle vendite idonee.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_8332b9ae4d8931da4a311f410a232619'] = 'Risultato del quarto trimestre 2020 di PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1e4fe71e24592a98260048fe05cbbb5b'] = 'È necessario configurare ID commerciante PayPal, e-mail, ID cliente e segreto.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a02758d758e8bec77a33d7f392eb3f8a'] = 'Nessuna valuta è stata impostata per questo modulo.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_afcae56aeb45bbff848348abf4824b44'] = 'Configurazione pagamento PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e0a9745011703bc991ab1af1f50ccd20'] = 'Offri ai tuoi clienti un\'esperienza di acquisto fluida che favorisca le conversioni e la fidelizzazione.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_af0fd51a752f317a87b2f7b724856034'] = 'Accetta pagamenti PayPal con una procedura di registrazione semplificata, un\'integrazione flessibile e una facile configurazione dell\'account.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b50f4dec6df62993204153f8d5db2c'] = 'Accesso a oltre 377 milioni di clienti PayPal in tutto il mondo*, con supporto per le valute locali per una migliore gestione del denaro.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_cb47de9d9350a9025c8c3b657c8c8268'] = 'Tranquillità per te e per i tuoi clienti grazie alla protezione acquirenti e venditori per le vendite idonee.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_8332b9ae4d8931da4a311f410a232619'] = 'Risultati del quarto trimestre 2020 di PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1e4fe71e24592a98260048fe05cbbb5b'] = 'È necessario configurare l\'ID commerciante, l\'indirizzo email, l\'ID cliente e la chiave segreta di PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a02758d758e8bec77a33d7f392eb3f8a'] = 'Per questo modulo non è stata impostata alcuna valuta.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_afcae56aeb45bbff848348abf4824b44'] = 'Configurazione del pagamento PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_116e78f6c1c4b4f66a57192817242e35'] = 'Ambiente di transazione';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_2652eec977dcb2a5aea85f5bec235b05'] = 'Sandbox';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_756d97bb256b8580d4d71ee0c547804e'] = 'Produzione';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_bb6e852329aacf2cc839e01ab1ce1773'] = 'Seleziona l\'ambiente di pagamento PayPal sandbox o produzione. È possibile ottenere transazioni reali solo in produzione, per i test, utilizzare sandbox.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_bb6e852329aacf2cc839e01ab1ce1773'] = 'Seleziona l\'ambiente di pagamento PayPal: sandbox o produzione. Puoi effettuare transazioni reali solo nell\'ambiente di produzione; per i test, utilizza l\'ambiente sandbox.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_ed4f8785248e2d9a8a8b25e5c483551a'] = 'ID Commerciante Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_6d132ffd3d699649441bdc627dd57eba'] = 'Inserisci l\'ID commerciante del tuo account sandbox PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_36808d0f8a32391ba62716d9831040e5'] = 'Indirizzo e-mail dell\'account sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_ff8336737d5f067b6c11724bd6fc944e'] = 'Inserisci l\'indirizzo email del tuo account PayPal di test.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a0bd7d42b20f8ca0c6f28bdd30a1af1f'] = 'ID client sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e7b65a83fa18a3396a4b140483e6f288'] = 'Inserisci l\'ID cliente dalle credenziali dell\'app dell\'account sandbox di PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_9af7eae52a08a132e079c3e910bb2cbe'] = 'Segreto del client sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_023d4f770106b82c4984d38c9033d393'] = 'Inserisci il Client Secret dalle credenziali dell\'app dell\'account sandbox di PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_450e2248dad7a152379bf016310e1eba'] = 'ID commerciante attivo';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3058efc14b28f688630f4e6770db5f03'] = 'Inserisci l\'ID commerciante del tuo conto PayPal attivo.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c916854e86ef605147fce41d400b6d74'] = 'E-mail dell\'account attivo';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_05e0b13ee68a1adcd4939da789611213'] = 'Inserisci l\'indirizzo email del tuo conto PayPal Live.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1087b413bc531d99ee4deb93e280bfed'] = 'ID client in tempo reale';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dfa5a074df3ad0ca4018a93243fcce1e'] = 'Inserisci l\'ID cliente dalle credenziali dell\'app PayPal Live Account.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b75793dc0a1d8225b39b8be4392339'] = 'Segreto del client live';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1382bf9075c663adbf10818ed4789234'] = 'Inserisci il Client Secret dalle credenziali dell\'app PayPal Live Account.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_783901fa167d90d82463e71da67c5e52'] = 'La protezione venditori PayPal non è applicabile.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c9cc8cce247e49bae79f15173ce97354'] = 'Salva';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a1c0702a8ce0c1562b372b93b5b8ae70'] = 'Inserisci l\'ID del commerciante';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_5f8d20654b3683fd837ad6766a99b388'] = 'ID commerciante non valido.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_451ad04779375f902c3c9de28f096f42'] = 'Inserisci l\'indirizzo e-mail dell\'account';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a23555edc4d09483a2d5d84478a6e8d3'] = 'Inserisci un indirizzo email valido per l\'account.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_d78b4ac6843d2634c46a59c2d0c2629d'] = 'Inserisci l\'ID cliente';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3640405a6244a23f537de55975337bf3'] = 'Inserisci il segreto del cliente';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_89493d1e532e6577510bbd93052bf20c'] = 'Il pagatore ha avviato una contestazione con PayPal per questo pagamento acquisito.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_9c28e950fb310ee005da61698456bc61'] = 'I fondi sequestrati sono stati stornati in seguito alla contestazione da parte del pagatore nei confronti dell\'emittente dello strumento finanziario utilizzato per effettuare tale pagamento.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_e2740ccb963c88d2739ee7ff5d493235'] = 'Il pagatore ha effettuato il pagamento tramite eCheck, che non è ancora stato accreditato.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_4e3da671b7e244adc46f9093e150fd99'] = 'Accedi al tuo account online. Nella sezione **Panoramica dell\'account**, accetta o rifiuta questo pagamento.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_f3d713097a36e0a9f589755465883f91'] = 'Non è possibile fornire ulteriori motivazioni specifiche. Per maggiori informazioni su questo pagamento acquisito, visita il tuo conto online o contatta PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_04263f8fe176af4cd42d9756fc136cfe'] = 'Il pagamento acquisito è in attesa di verifica manuale.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_c343691c63a475e04acf19b98945bc59'] = 'Il beneficiario non ha ancora impostato le preferenze di ricezione appropriate per il proprio conto. Per ulteriori informazioni su come accettare o rifiutare questo pagamento, visita il tuo conto online. Questo motivo viene in genere fornito in situazioni come quando la valuta del pagamento ricevuto è diversa dalla valuta principale del conto del beneficiario.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_71013ee01f1a31c0310bcf4a91162c29'] = 'I fondi sequestrati sono stati restituiti.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_a4656378d78c3d73b354ddc0d4dabe18'] = 'Il pagatore deve inviare i fondi per questo pagamento acquisito. Questo codice compare generalmente per i bonifici elettronici manuali.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_1bca65212e4eba1b64766eeb66091af2'] = 'Il beneficiario non possiede un conto PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_53c3196bca5dde9b71e5be8287ae9cde'] = 'L\'account PayPal del beneficiario non è verificato';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_a7a37ae71b70fe671308691cc6fe03dc'] = 'Transazioni PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Riferimento ordine';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_55307c995094996234479b33fbc16bd1'] = 'Riferimento ordine in QloApps della transazione PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'ID transazione PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_dae74f84a69dab4b8e04999f2460febf'] = 'ID della transazione PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2763b4242763cbee7190de46d45d204f'] = 'Totale della transazione';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_e8453b7e2a7ccf2edeae228682a61b8d'] = 'Importo totale pagato nella transazione PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ce26601dac0dea138b7295f02b7620a7'] = 'Cliente';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_168f21218c30dcc245dc1c62c103cb7b'] = 'Data di creazione dell\'ordine.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_630f6dc397fe74e52d5189e2c80f282b'] = 'Torna all\'elenco';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2a43821ec21eadc4073fc65dc35d2198'] = 'Tipo di rimborso non valido.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_4e7f26d58027e5f9611cc5fe9d901e06'] = 'Importo del rimborso non valido.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_5eaf60217767a2ad1e30d36dc3a1c12c'] = 'Inserisci un motivo di rimborso valido (sono ammessi solo caratteri alfanumerici).';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ee4f91ae6dc5a35a0060efa164cb65d9'] = 'Importo del rimborso non valido. L\'importo massimo disponibile per il rimborso è';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6a8b1040e75c9723eef0a783ffc0e1d2'] = 'Il rimborso per questa transazione è già stato effettuato.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_446b416d535ed3f547fcd653dc11d49c'] = 'Richiesta non valida';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Questo metodo di pagamento non è disponibile.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_2b46a852749d321a4c6eafa3b36b643c'] = 'Pagamento tramite PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_78170aac364ebe8527577b742dc2111d'] = 'Dettagli della transazione PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_34c15b4659b2241667e4c5d534270a17'] = 'Ambiente di pagamento';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2652eec977dcb2a5aea85f5bec235b05'] = 'Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_756d97bb256b8580d4d71ee0c547804e'] = 'Produzione';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_6f097b8feb2af129c8f74c786c130c1c'] = 'ID di riferimento PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'ID transazione PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_157c928dae48d88d19fb2ced2afbdd71'] = 'ID ordine PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_fdabf4e63a3cc1fe987269ff4e629148'] = 'Importo della transazione';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Riferimento ordine';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea989f83006e233627987293f4bde0a'] = 'Nome del cliente';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_54945fdafec2c65f0f5561d65b165f1a'] = 'E-mail del cliente';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_475007c00d7c166cca01a44ecfd068ff'] = 'Visualizza cliente';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_4351cfebe4b61d8aa5efa1d020710005'] = 'Visualizzazione';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea78fadfafeae47ad786c288667eadf'] = 'Stato del pagamento';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_8f7afecbc8fbc4cd0f50a57d1172482e'] = 'COMPLETATO';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_31738cd694667ccdfa2cbc65249de5cc'] = 'Data di pagamento';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_580d87d5c5121696825f17708b1ec065'] = 'Importo totale rimborsato';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_8b123a0f5d61720a4273bc4ed1d613a3'] = 'Transazione di rimborso';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a3a13394565fb6956d6948a1dbb8fe3f'] = 'Importo totale rimborsato';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_9d9dca90e919bd4c8febf55ea7a25b5f'] = 'Importo totale disponibile per il rimborso';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_51890b292429265077afcc0b2bb6f34a'] = 'Seleziona il tipo di rimborso. Seleziona \\\"rimborso parziale\\\" per ottenere un rimborso parziale dell\'importo della transazione. Seleziona \\\"rimborso totale\\\" per ottenere il rimborso dell\'intero importo della transazione.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_d8fb839f1db11646b85354c3fb50fda3'] = 'Tipo di rimborso';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_4f5a217b333e276be931951be6dc28f0'] = 'Seleziona il tipo di rimborso';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_abcec07843d3ec02783b27587560f85f'] = 'Rimborso completo';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_c985a711556e2edf5cac28dfbdb43ff0'] = 'Rimborso parziale';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_84bca5dc34bb0d1244a9e0f323878665'] = 'Inserisci l\'importo che desideri rimborsare dall\'importo della transazione.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_b782d4ff61550d7e8cdee4cf70a03788'] = 'Importo del rimborso';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_6bbeabf389367bc93090db6dd0c13c4e'] = 'massimo';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_85689c24167c4690a0e346c46a17598c'] = 'Inserisci una nota per questo rimborso.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_97d8f33367ecaeee79d5255b447c8827'] = 'Rimborso Nota';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_76f0ed934de85cc7131910b32ede7714'] = 'Rimborso';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_072ab77c58ea38de4e3272c3eed624c1'] = 'Elenco dei rimborsi';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_88427ec035734b45aae9f7d8859a5008'] = 'ID transazione';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_b2f40690858b404ed10e62bdf422c704'] = 'Quantità';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a1fa27779242b4902f7ae3bdd5c6d508'] = 'Tipo';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_ec53a8c4f07baed5d8825072c89799be'] = 'Stato';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_44749712dbec183e983dcd78a7736c41'] = 'Data';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_91921ada405fd6ba65dff028df047cb6'] = 'Osservazione';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a207494d393a4f4909f746fd24440440'] = 'Nessun rimborso è stato ancora effettuato.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_e3bc22b32f4abd925670253972326260'] = 'Importo totale rimborsato:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_7b12dad517fd9056aabf8099a8173ddf'] = 'Il pagamento non è andato a buon fine per il seguente motivo:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_3d9f514d46849760ef1b1412e314fd99'] = 'Errore:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_0d6779532e0735f6a9b05723ab191bc3'] = 'Descrizione dell\'errore:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_569fd05bdafa1712c4f6be5b153b8418'] = 'Altri metodi di pagamento';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_cancel_ack_0e1b6078789badcbfae8640288a46f0f'] = 'Hai annullato il pagamento tramite PayPal. Puoi riprovare con PayPal o utilizzare un metodo di pagamento diverso.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Il tuo ordine per %s è completo.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_cd44f47a868e5e42fa1a23b775504490'] = 'Importo totale pagato';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_19c419a8a4f1cd621853376a930a2e24'] = 'È stata inviata un\'e-mail con queste informazioni.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_30163d8fc3068e8297e7ab5bf32aec87'] = 'Il tuo ordine verrà spedito il prima possibile.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_ca7e41a658753c87973936d7ce2429a8'] = 'Se avete domande, commenti o dubbi, contattateci.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_66fcf4c223bbf4c7c886d4784e1f62e4'] = 'team di esperti nell\'assistenza clienti';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_7c2ed2f8a5fc3c48f2d49196f96b34b1'] = 'Abbiamo riscontrato un problema con il tuo pagamento. Ti preghiamo di contattarci.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_17a17ba93e6ac0192bd563905e87538d'] = 'Il pagamento può essere effettuato tramite PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_644253cd300d73471cf86296d532b964'] = 'Paga tramite PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_25e8f2fd2871c8423bbe4e254066cd98'] = 'Attendere prego...';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_41a9d5e195648f50143f1c1abf5e00e6'] = 'Cliente di QloApps che ha effettuato una transazione PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ec53a8c4f07baed5d8825072c89799be'] = 'Stato';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2ea78fadfafeae47ad786c288667eadf'] = 'Stato del pagamento';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_3516529c1d87f5fde62d6841140f5dc0'] = 'Stato attuale della transazione PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6fbc355a02359656f1e4540d58b784e1'] = 'Data dell\'ordine';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_229a7ec501323b94db7ff3157a7623c9'] = 'identificativo del venditore';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_daa9d1b5682c462e8fc8585bb4cf868c'] = 'Inserisci l\'ID commerciante del tuo account PayPal.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_275f5257af70b08ed6def799bfa214b3'] = 'Account e-mail';
@@ -26,97 +139,4 @@ $_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_76525f0f34b48475e5ca3
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_21fb87c3b83156a1c9e7c51239705335'] = 'Immettere l\'ID cliente dalle credenziali dell\'app dell\'account PayPal.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_734082edf44417dd19cc65943aa65c36'] = 'Segreto del cliente';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_92718280c77bfa861693c57bad5a0632'] = 'Immettere il segreto client dalle credenziali dell\'app dell\'account PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_783901fa167d90d82463e71da67c5e52'] = 'Protezione venditore PayPal non applicabile';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c9cc8cce247e49bae79f15173ce97354'] = 'Salva';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a1c0702a8ce0c1562b372b93b5b8ae70'] = 'Inserisci l\'ID commerciante';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_5f8d20654b3683fd837ad6766a99b388'] = 'ID commerciante fornito non valido.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_451ad04779375f902c3c9de28f096f42'] = 'Inserisci l\'email dell\'account';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a23555edc4d09483a2d5d84478a6e8d3'] = 'Inserisci un indirizzo email valido per l\'account';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_d78b4ac6843d2634c46a59c2d0c2629d'] = 'Inserisci l\'ID cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3640405a6244a23f537de55975337bf3'] = 'Inserisci il segreto del cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_89493d1e532e6577510bbd93052bf20c'] = 'Il pagatore ha avviato una controversia per questo pagamento acquisito con PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_9c28e950fb310ee005da61698456bc61'] = 'I fondi catturati sono stati stornati in risposta al pagatore che contestava questo pagamento catturato con l\'emittente dello strumento finanziario utilizzato per pagare questo pagamento catturato.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_e2740ccb963c88d2739ee7ff5d493235'] = 'Il pagatore pagato da un eCheck che non è ancora stato cancellato.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_4e3da671b7e244adc46f9093e150fd99'] = 'Visita il tuo account online. Nella tua ** Panoramica account **, accetta e rifiuta questo pagamento.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_f3d713097a36e0a9f589755465883f91'] = 'Non è possibile fornire alcun motivo specifico aggiuntivo. Per ulteriori informazioni su questo pagamento acquisito, visita il tuo account online o contatta PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_04263f8fe176af4cd42d9756fc136cfe'] = 'Il pagamento acquisito è in attesa di revisione manuale.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_c343691c63a475e04acf19b98945bc59'] = 'Il beneficiario non ha ancora impostato le preferenze di ricezione appropriate per il proprio account. Per ulteriori informazioni su come accettare o rifiutare questo pagamento, visita il tuo account online. Questo motivo viene in genere offerto in scenari come quando la valuta del pagamento acquisito è diversa dalla valuta di detenzione principale del beneficiario.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_71013ee01f1a31c0310bcf4a91162c29'] = 'I fondi catturati sono stati rimborsati.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_a4656378d78c3d73b354ddc0d4dabe18'] = 'Il pagatore deve inviare i fondi per questo pagamento acquisito. Questo codice viene generalmente visualizzato per EFT manuali.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_1bca65212e4eba1b64766eeb66091af2'] = 'Il beneficiario non dispone di un account PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_53c3196bca5dde9b71e5be8287ae9cde'] = 'L\'account PayPal del beneficiario non è verificato';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_a7a37ae71b70fe671308691cc6fe03dc'] = 'Transazioni PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_1e860e56970a81a1ba3e1fcb7fccc846'] = 'riferenza dell\'ordine';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_55307c995094996234479b33fbc16bd1'] = 'Riferimento dell\'ordine in QloApps della transazione PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'ID transazione PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_dae74f84a69dab4b8e04999f2460febf'] = 'ID della transazione PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2763b4242763cbee7190de46d45d204f'] = 'Totale transazione';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_e8453b7e2a7ccf2edeae228682a61b8d'] = 'Importo totale pagato nella transazione PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ce26601dac0dea138b7295f02b7620a7'] = 'Cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_41a9d5e195648f50143f1c1abf5e00e6'] = 'Cliente in QloApps che ha effettuato la transazione PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ec53a8c4f07baed5d8825072c89799be'] = 'Stato';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2ea78fadfafeae47ad786c288667eadf'] = 'Stato del pagamento';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_3516529c1d87f5fde62d6841140f5dc0'] = 'Stato attuale della transazione PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6fbc355a02359656f1e4540d58b784e1'] = 'Data dell\'ordine';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_168f21218c30dcc245dc1c62c103cb7b'] = 'Data di creazione dell\'ordine.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_630f6dc397fe74e52d5189e2c80f282b'] = 'Torna alla lista';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2a43821ec21eadc4073fc65dc35d2198'] = 'Tipo di rimborso non valido.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_4e7f26d58027e5f9611cc5fe9d901e06'] = 'Importo del rimborso non valido.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_5eaf60217767a2ad1e30d36dc3a1c12c'] = 'Inserisci un motivo del rimborso valido (sono ammessi solo caratteri alfanumerici).';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ee4f91ae6dc5a35a0060efa164cb65d9'] = 'Importo del rimborso non valido. Max. l\'importo disponibile per il rimborso è';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6a8b1040e75c9723eef0a783ffc0e1d2'] = 'Il rimborso è già stato effettuato per questa transazione.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_446b416d535ed3f547fcd653dc11d49c'] = 'Richiesta non valida';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Questo metodo di pagamento non è disponibile.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_2b46a852749d321a4c6eafa3b36b643c'] = 'Pagamento PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_78170aac364ebe8527577b742dc2111d'] = 'Dettagli della transazione PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_34c15b4659b2241667e4c5d534270a17'] = 'Ambiente di pagamento';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2652eec977dcb2a5aea85f5bec235b05'] = 'Sandbox';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_756d97bb256b8580d4d71ee0c547804e'] = 'Produzione';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_6f097b8feb2af129c8f74c786c130c1c'] = 'ID di riferimento PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'ID transazione PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_157c928dae48d88d19fb2ced2afbdd71'] = 'ID ordine PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_fdabf4e63a3cc1fe987269ff4e629148'] = 'totale della transazione';
$_MODULE['<{qlopaypalcommerce}prestashop>view_e98b5a6351fecb55b2f890686f31856d'] = 'Riferimento ordine QloApps';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea989f83006e233627987293f4bde0a'] = 'Nome del cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_54945fdafec2c65f0f5561d65b165f1a'] = 'Email cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_475007c00d7c166cca01a44ecfd068ff'] = 'Visualizza cliente';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_4351cfebe4b61d8aa5efa1d020710005'] = 'Visualizza';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea78fadfafeae47ad786c288667eadf'] = 'Stato del pagamento';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_8f7afecbc8fbc4cd0f50a57d1172482e'] = 'COMPLETATO';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_31738cd694667ccdfa2cbc65249de5cc'] = 'Data di pagamento';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_580d87d5c5121696825f17708b1ec065'] = 'Importo totale rimborsato';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_8b123a0f5d61720a4273bc4ed1d613a3'] = 'Transazione di rimborso';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a3a13394565fb6956d6948a1dbb8fe3f'] = 'Importo totale rimborsato';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_9d9dca90e919bd4c8febf55ea7a25b5f'] = 'Importo totale disponibile da rimborsare';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_51890b292429265077afcc0b2bb6f34a'] = 'Seleziona il tipo di rimborso. Seleziona rimborso parziale per rimborsare un importo parziale dalla transazione. Seleziona il rimborso completo per rimborsare l\'importo totale della transazione.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_d8fb839f1db11646b85354c3fb50fda3'] = 'Tipo di rimborso';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_4f5a217b333e276be931951be6dc28f0'] = 'Seleziona Tipo di rimborso';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_abcec07843d3ec02783b27587560f85f'] = 'Rimborso completo';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_c985a711556e2edf5cac28dfbdb43ff0'] = 'Rimborso parziale';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_84bca5dc34bb0d1244a9e0f323878665'] = 'Inserisci l\'importo che desideri rimborsare dall\'importo della transazione.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_b782d4ff61550d7e8cdee4cf70a03788'] = 'Importo rimborsato';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_6bbeabf389367bc93090db6dd0c13c4e'] = 'max.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_85689c24167c4690a0e346c46a17598c'] = 'Inserisci un commento per questo rimborso.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_97d8f33367ecaeee79d5255b447c8827'] = 'Nota sul rimborso';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_76f0ed934de85cc7131910b32ede7714'] = 'Rimborso';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_072ab77c58ea38de4e3272c3eed624c1'] = 'Elenco rimborsi';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_88427ec035734b45aae9f7d8859a5008'] = 'ID transazione';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_b2f40690858b404ed10e62bdf422c704'] = 'Quantità';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a1fa27779242b4902f7ae3bdd5c6d508'] = 'genere';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_ec53a8c4f07baed5d8825072c89799be'] = 'Stato';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_44749712dbec183e983dcd78a7736c41'] = 'Data';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a207494d393a4f4909f746fd24440440'] = 'Nessun rimborso ancora creato.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_e3bc22b32f4abd925670253972326260'] = 'Importo totale rimborsato: ';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_7b12dad517fd9056aabf8099a8173ddf'] = 'Il tuo pagamento non è andato a buon fine per i seguenti motivi:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_3d9f514d46849760ef1b1412e314fd99'] = 'Errore:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_0d6779532e0735f6a9b05723ab191bc3'] = 'Descrizione dell\'errore:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_569fd05bdafa1712c4f6be5b153b8418'] = 'Altri metodi di pagamento';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_cancel_ack_0e1b6078789badcbfae8640288a46f0f'] = 'Hai annullato il pagamento tramite PayPal. Puoi riprovare con PayPal o provare un metodo di pagamento diverso.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Il tuo ordine su% s è completo.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_cd44f47a868e5e42fa1a23b775504490'] = 'Importo totale pagato';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_19c419a8a4f1cd621853376a930a2e24'] = 'È stata inviata un\'e-mail con queste informazioni.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_30163d8fc3068e8297e7ab5bf32aec87'] = 'Il tuo ordine verrà inviato il prima possibile.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_ca7e41a658753c87973936d7ce2429a8'] = 'In caso di domande, commenti o dubbi, contattare il nostro';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_66fcf4c223bbf4c7c886d4784e1f62e4'] = 'team di assistenza clienti esperto';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_7c2ed2f8a5fc3c48f2d49196f96b34b1'] = 'Abbiamo notato un problema con il tuo pagamento. Si prega di contattare il nostro';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_25e8f2fd2871c8423bbe4e254066cd98'] = 'Attendere prego...';
diff --git a/modules/qlopaypalcommerce/translations/nl.php b/modules/qlopaypalcommerce/translations/nl.php
index f257d5cab..117e95e6b 100644
--- a/modules/qlopaypalcommerce/translations/nl.php
+++ b/modules/qlopaypalcommerce/translations/nl.php
@@ -2,22 +2,123 @@
global $_MODULE;
$_MODULE = array();
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dba5abcd5b8bb0ee23a6bde15a6e5fde'] = 'QloApps PayPal Afrekenen';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dba5abcd5b8bb0ee23a6bde15a6e5fde'] = 'QloApps PayPal Checkout';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1639a5f6b16f8d4a04393dbdff0e05f6'] = 'Een instant wereldwijd bedrijf.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dd5e9bb870ec616039f0fe9f2bd4726b'] = 'Eén integratie voor al uw online betalingsbehoeften.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e654f7a86a4458b9cd662267e0f29b52'] = 'Voordelen';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e0a9745011703bc991ab1af1f50ccd20'] = 'Zorg voor een naadloze koopervaring voor uw klanten die conversie en loyaliteit stimuleert.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_af0fd51a752f317a87b2f7b724856034'] = 'Accepteer PayPal-betalingen met vereenvoudigde introductie, aanpasbare integratie en eenvoudige accountconfiguratie.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b50f4dec6df62993204153f8d5db2c'] = 'Toegang tot meer dan 377 miljoen PayPal-klanten over de hele wereld *, met ondersteuning in lokale valuta voor beter geldbeheer.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_cb47de9d9350a9025c8c3b657c8c8268'] = 'Gemoedsrust voor u en uw klanten met kopers- en verkopersbescherming bij in aanmerking komende verkopen.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_8332b9ae4d8931da4a311f410a232619'] = 'PayPal-resultaat vierde kwartaal 2020';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1e4fe71e24592a98260048fe05cbbb5b'] = 'PayPal Merchant ID, Email, Client ID en Secret moeten worden geconfigureerd.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e0a9745011703bc991ab1af1f50ccd20'] = 'Bied uw klanten een naadloze koopervaring die leidt tot meer conversie en klantloyaliteit.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_af0fd51a752f317a87b2f7b724856034'] = 'Accepteer PayPal-betalingen met een vereenvoudigd onboardingproces, flexibele integratie en eenvoudige accountconfiguratie.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b50f4dec6df62993204153f8d5db2c'] = 'Toegang tot meer dan 377 miljoen PayPal-klanten wereldwijd*, met ondersteuning voor lokale valuta voor beter financieel beheer.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_cb47de9d9350a9025c8c3b657c8c8268'] = 'Gemoedsrust voor u en uw klanten dankzij kopers- en verkopersbescherming bij in aanmerking komende transacties.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_8332b9ae4d8931da4a311f410a232619'] = 'Resultaten van PayPal over het vierde kwartaal van 2020';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1e4fe71e24592a98260048fe05cbbb5b'] = 'De PayPal-handelaars-ID, het e-mailadres, de klant-ID en het geheim moeten worden geconfigureerd.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a02758d758e8bec77a33d7f392eb3f8a'] = 'Er is geen valuta ingesteld voor deze module.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_afcae56aeb45bbff848348abf4824b44'] = 'PayPal-betalingsconfiguratie';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_116e78f6c1c4b4f66a57192817242e35'] = 'Transactieomgeving';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_2652eec977dcb2a5aea85f5bec235b05'] = 'Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_2652eec977dcb2a5aea85f5bec235b05'] = 'Zandbak';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_756d97bb256b8580d4d71ee0c547804e'] = 'Productie';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_bb6e852329aacf2cc839e01ab1ce1773'] = 'Selecteer de PayPal-betalingsomgeving, sandbox of productie. U kunt alleen een echte transactie krijgen bij productie, gebruik sandbox om te testen.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_bb6e852329aacf2cc839e01ab1ce1773'] = 'Selecteer de PayPal-betaalomgeving: sandbox of productie. Echte transacties zijn alleen mogelijk in de productieomgeving; gebruik de sandbox voor testdoeleinden.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_ed4f8785248e2d9a8a8b25e5c483551a'] = 'Sandbox-handelaars-ID';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_6d132ffd3d699649441bdc627dd57eba'] = 'Voer de verkoper-ID van uw PayPal-sandboxaccount in.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_36808d0f8a32391ba62716d9831040e5'] = 'Sandbox-account e-mail';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_ff8336737d5f067b6c11724bd6fc944e'] = 'Voer het e-mailadres van uw PayPal-sandboxaccount in.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a0bd7d42b20f8ca0c6f28bdd30a1af1f'] = 'Sandbox-client-ID';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e7b65a83fa18a3396a4b140483e6f288'] = 'Voer de client-ID in van de inloggegevens van uw PayPal-sandboxaccount.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_9af7eae52a08a132e079c3e910bb2cbe'] = 'Sandbox-clientgeheim';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_023d4f770106b82c4984d38c9033d393'] = 'Voer het Client Secret in van de inloggegevens van uw PayPal-sandboxaccount.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_450e2248dad7a152379bf016310e1eba'] = 'Live Merchant ID';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3058efc14b28f688630f4e6770db5f03'] = 'Voer de verkoper-ID van uw PayPal Live-account in.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c916854e86ef605147fce41d400b6d74'] = 'Live account-e-mail';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_05e0b13ee68a1adcd4939da789611213'] = 'Voer het e-mailadres van uw PayPal Live-account in.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1087b413bc531d99ee4deb93e280bfed'] = 'Live client-ID';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dfa5a074df3ad0ca4018a93243fcce1e'] = 'Voer de klant-ID in die u hebt opgegeven in de PayPal Live-accountapp.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b75793dc0a1d8225b39b8be4392339'] = 'Live Client Secret';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1382bf9075c663adbf10818ed4789234'] = 'Voer het Client Secret in, dat u vindt in de inloggegevens van uw PayPal Live-account.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_783901fa167d90d82463e71da67c5e52'] = 'PayPal-verkopersbescherming is niet van toepassing.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c9cc8cce247e49bae79f15173ce97354'] = 'Redden';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a1c0702a8ce0c1562b372b93b5b8ae70'] = 'Voer het verkopers-ID in.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_5f8d20654b3683fd837ad6766a99b388'] = 'Ongeldig verkopers-ID opgegeven.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_451ad04779375f902c3c9de28f096f42'] = 'Voer het e-mailadres van uw account in.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a23555edc4d09483a2d5d84478a6e8d3'] = 'Voer een geldig e-mailadres van het account in.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_d78b4ac6843d2634c46a59c2d0c2629d'] = 'Voer uw klant-ID in.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3640405a6244a23f537de55975337bf3'] = 'Voer het klantgeheim in.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_89493d1e532e6577510bbd93052bf20c'] = 'De betaler heeft een geschil over deze vastgelegde betaling bij PayPal ingediend.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_9c28e950fb310ee005da61698456bc61'] = 'De in beslag genomen gelden werden teruggedraaid nadat de betaler de in beslag genomen betaling had betwist bij de uitgever van het financiële instrument waarmee deze betaling was verricht.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_e2740ccb963c88d2739ee7ff5d493235'] = 'De betaler heeft betaald met een eCheck die nog niet is verwerkt.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_4e3da671b7e244adc46f9093e150fd99'] = 'Ga naar uw online account. In uw **Accountoverzicht** kunt u deze betaling accepteren of weigeren.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_f3d713097a36e0a9f589755465883f91'] = 'Er kan geen verdere specifieke reden worden opgegeven. Voor meer informatie over deze vastgelegde betaling kunt u uw account online raadplegen of contact opnemen met PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_04263f8fe176af4cd42d9756fc136cfe'] = 'De vastgelegde betaling wordt momenteel handmatig gecontroleerd.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_c343691c63a475e04acf19b98945bc59'] = 'De begunstigde heeft nog geen geschikte ontvangstvoorkeuren voor zijn of haar rekening ingesteld. Ga naar uw online account voor meer informatie over het accepteren of weigeren van deze betaling. Deze reden wordt doorgaans aangevoerd in situaties zoals wanneer de valuta van de ontvangen betaling afwijkt van de primaire valuta van de begunstigde.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_71013ee01f1a31c0310bcf4a91162c29'] = 'De in beslag genomen gelden werden terugbetaald.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_a4656378d78c3d73b354ddc0d4dabe18'] = 'De betaler moet het geld voor deze vastgelegde betaling overmaken. Deze code verschijnt doorgaans bij handmatige elektronische overboekingen (EFT\'s).';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_1bca65212e4eba1b64766eeb66091af2'] = 'De ontvanger heeft geen PayPal-account.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_53c3196bca5dde9b71e5be8287ae9cde'] = 'Het PayPal-account van de ontvanger is niet geverifieerd.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_a7a37ae71b70fe671308691cc6fe03dc'] = 'PayPal-transacties';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Bestelreferentie';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_55307c995094996234479b33fbc16bd1'] = 'Orderreferentie in QloApps van de PayPal-transactie';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'PayPal-transactie-ID';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_dae74f84a69dab4b8e04999f2460febf'] = 'ID van de PayPal-transactie';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2763b4242763cbee7190de46d45d204f'] = 'Transactietotaal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_e8453b7e2a7ccf2edeae228682a61b8d'] = 'Totaal betaald bedrag in de PayPal-transactie';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ce26601dac0dea138b7295f02b7620a7'] = 'Klant';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_446b416d535ed3f547fcd653dc11d49c'] = 'Ongeldig verzoek';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Deze betaalmethode is niet beschikbaar.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_2b46a852749d321a4c6eafa3b36b643c'] = 'PayPal Checkout';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_78170aac364ebe8527577b742dc2111d'] = 'PayPal-transactiegegevens';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_34c15b4659b2241667e4c5d534270a17'] = 'Betalingsomgeving';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2652eec977dcb2a5aea85f5bec235b05'] = 'Zandbak';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_756d97bb256b8580d4d71ee0c547804e'] = 'Productie';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_6f097b8feb2af129c8f74c786c130c1c'] = 'PayPal-referentie-ID';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'PayPal-transactie-ID';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_157c928dae48d88d19fb2ced2afbdd71'] = 'PayPal-bestel-ID';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_fdabf4e63a3cc1fe987269ff4e629148'] = 'Transactiebedrag';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Bestelreferentie';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea989f83006e233627987293f4bde0a'] = 'Klantnaam';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_54945fdafec2c65f0f5561d65b165f1a'] = 'E-mailadres van de klant';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_475007c00d7c166cca01a44ecfd068ff'] = 'Klant bekijken';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_4351cfebe4b61d8aa5efa1d020710005'] = 'Weergave';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea78fadfafeae47ad786c288667eadf'] = 'Betalingsstatus';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_8f7afecbc8fbc4cd0f50a57d1172482e'] = 'VOLTOOID';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_31738cd694667ccdfa2cbc65249de5cc'] = 'Betaaldatum';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_580d87d5c5121696825f17708b1ec065'] = 'Totaal terugbetaald bedrag';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_8b123a0f5d61720a4273bc4ed1d613a3'] = 'Terugbetalingstransactie';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a3a13394565fb6956d6948a1dbb8fe3f'] = 'Totaal terugbetaald bedrag';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_9d9dca90e919bd4c8febf55ea7a25b5f'] = 'Totaal beschikbaar bedrag voor terugbetaling';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_51890b292429265077afcc0b2bb6f34a'] = 'Selecteer het type terugbetaling. Selecteer \'gedeeltelijke terugbetaling\' om een deel van het transactiebedrag terug te betalen. Selecteer \'volledige terugbetaling\' om het volledige transactiebedrag terug te betalen.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_d8fb839f1db11646b85354c3fb50fda3'] = 'Type terugbetaling';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_4f5a217b333e276be931951be6dc28f0'] = 'Selecteer het type terugbetaling';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_abcec07843d3ec02783b27587560f85f'] = 'Volledige terugbetaling';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_c985a711556e2edf5cac28dfbdb43ff0'] = 'Gedeeltelijke terugbetaling';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_84bca5dc34bb0d1244a9e0f323878665'] = 'Voer het bedrag in dat u wilt terugbetalen van het transactiebedrag.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_b782d4ff61550d7e8cdee4cf70a03788'] = 'Terug te betalen bedrag';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_6bbeabf389367bc93090db6dd0c13c4e'] = 'max.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_85689c24167c4690a0e346c46a17598c'] = 'Voeg een opmerking toe aan deze terugbetaling.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_97d8f33367ecaeee79d5255b447c8827'] = 'Opmerking over terugbetaling';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_76f0ed934de85cc7131910b32ede7714'] = 'Terugbetaling';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_072ab77c58ea38de4e3272c3eed624c1'] = 'Terugbetalingslijst';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_88427ec035734b45aae9f7d8859a5008'] = 'Transactie-ID';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_b2f40690858b404ed10e62bdf422c704'] = 'Hoeveelheid';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a1fa27779242b4902f7ae3bdd5c6d508'] = 'Type';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_ec53a8c4f07baed5d8825072c89799be'] = 'Status';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_44749712dbec183e983dcd78a7736c41'] = 'Datum';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_91921ada405fd6ba65dff028df047cb6'] = 'Opmerking';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a207494d393a4f4909f746fd24440440'] = 'Er zijn nog geen terugbetalingen aangemaakt.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_e3bc22b32f4abd925670253972326260'] = 'Totaal terugbetaald bedrag:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_7b12dad517fd9056aabf8099a8173ddf'] = 'Uw betaling is mislukt om de volgende reden:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_3d9f514d46849760ef1b1412e314fd99'] = 'Fout:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_0d6779532e0735f6a9b05723ab191bc3'] = 'Foutbeschrijving:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_569fd05bdafa1712c4f6be5b153b8418'] = 'Andere betaalmethoden';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_cancel_ack_0e1b6078789badcbfae8640288a46f0f'] = 'Je hebt de betaling via PayPal geannuleerd. Je kunt het opnieuw proberen met PayPal of een andere betaalmethode gebruiken.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Uw bestelling op %s is voltooid.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_cd44f47a868e5e42fa1a23b775504490'] = 'Totaal betaald bedrag';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_19c419a8a4f1cd621853376a930a2e24'] = 'Er is een e-mail met deze informatie verzonden.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_30163d8fc3068e8297e7ab5bf32aec87'] = 'Je bestelling wordt zo snel mogelijk verzonden.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_ca7e41a658753c87973936d7ce2429a8'] = 'Heeft u vragen, opmerkingen of bent u ergens bezorgd over? Neem dan contact met ons op.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_66fcf4c223bbf4c7c886d4784e1f62e4'] = 'deskundig klantenserviceteam';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_7c2ed2f8a5fc3c48f2d49196f96b34b1'] = 'We hebben een probleem met uw betaling geconstateerd. Neem contact met ons op.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_17a17ba93e6ac0192bd563905e87538d'] = 'Betaal via de betaalopties van PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_644253cd300d73471cf86296d532b964'] = 'Betaal via PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_25e8f2fd2871c8423bbe4e254066cd98'] = 'Even geduld alstublieft...';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_229a7ec501323b94db7ff3157a7623c9'] = 'Verkoper-ID';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_daa9d1b5682c462e8fc8585bb4cf868c'] = 'Voer de handelaar-ID van uw PayPal-rekening in.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_275f5257af70b08ed6def799bfa214b3'] = 'E-mailaccount';
@@ -26,33 +127,6 @@ $_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_76525f0f34b48475e5ca3
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_21fb87c3b83156a1c9e7c51239705335'] = 'Voer de klant-ID van de PayPal-accountapp-inloggegevens in.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_734082edf44417dd19cc65943aa65c36'] = 'Cliëntgeheim';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_92718280c77bfa861693c57bad5a0632'] = 'Voer het klantgeheim van de app-inloggegevens van de PayPal-account in.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_783901fa167d90d82463e71da67c5e52'] = 'PayPal Verkopersbescherming niet van toepassing';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c9cc8cce247e49bae79f15173ce97354'] = 'Opslaan';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a1c0702a8ce0c1562b372b93b5b8ae70'] = 'Voer een verkoper-ID in';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_5f8d20654b3683fd837ad6766a99b388'] = 'Ongeldige verkoper-ID opgegeven.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_451ad04779375f902c3c9de28f096f42'] = 'Voer uw account e-mailadres in';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a23555edc4d09483a2d5d84478a6e8d3'] = 'Voer een geldig account-e-mailadres in';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_d78b4ac6843d2634c46a59c2d0c2629d'] = 'Voer de klant-ID in';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3640405a6244a23f537de55975337bf3'] = 'Voer het klantgeheim in';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_89493d1e532e6577510bbd93052bf20c'] = 'De betaler startte een geschil voor deze vastgelegde betaling met PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_9c28e950fb310ee005da61698456bc61'] = 'De vastgelegde fondsen werden teruggeboekt als reactie op het feit dat de betaler deze vastgelegde betaling betwistte bij de uitgever van het financiële instrument dat werd gebruikt om deze vastgelegde betaling te betalen.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_e2740ccb963c88d2739ee7ff5d493235'] = 'De betaler heeft betaald met een eCheck die nog niet is vereffend.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_4e3da671b7e244adc46f9093e150fd99'] = 'Bezoek uw online account. Accepteer en weiger deze betaling in uw ** Accountoverzicht **.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_f3d713097a36e0a9f589755465883f91'] = 'Er kan geen aanvullende specifieke reden worden opgegeven. Ga naar uw account online of neem contact op met PayPal voor meer informatie over deze vastgelegde betaling.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_04263f8fe176af4cd42d9756fc136cfe'] = 'De vastgelegde betaling is in afwachting van handmatige beoordeling.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_c343691c63a475e04acf19b98945bc59'] = 'De begunstigde heeft nog geen geschikte ontvangstvoorkeuren voor zijn account ingesteld. Ga naar uw online account voor meer informatie over het accepteren of weigeren van deze betaling. Deze reden wordt doorgaans aangeboden in scenario\'s, zoals wanneer de valuta van de vastgelegde betaling verschilt van de primaire valuta van de begunstigde.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_71013ee01f1a31c0310bcf4a91162c29'] = 'Het buitgemaakte geld werd terugbetaald.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_a4656378d78c3d73b354ddc0d4dabe18'] = 'De betaler moet het geld sturen voor deze vastgelegde betaling. Deze code verschijnt meestal voor handmatige elektronische overboekingen.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_1bca65212e4eba1b64766eeb66091af2'] = 'De begunstigde heeft geen PayPal-rekening.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_53c3196bca5dde9b71e5be8287ae9cde'] = 'De PayPal-rekening van de begunstigde is niet geverifieerd';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_a7a37ae71b70fe671308691cc6fe03dc'] = 'PayPal-transacties';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Bestelreferentie';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_55307c995094996234479b33fbc16bd1'] = 'Bestelreferentie in QloApps van de PayPal-transactie';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'PayPal-transactie-ID';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_dae74f84a69dab4b8e04999f2460febf'] = 'Id van de PayPal-transactie';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2763b4242763cbee7190de46d45d204f'] = 'Transactie totaal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_e8453b7e2a7ccf2edeae228682a61b8d'] = 'Totaalbedrag betaald in de PayPal-transactie';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ce26601dac0dea138b7295f02b7620a7'] = 'Klant';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_41a9d5e195648f50143f1c1abf5e00e6'] = 'Klant in de QloApps die een PayPal-transactie heeft uitgevoerd.';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ec53a8c4f07baed5d8825072c89799be'] = 'Toestand';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2ea78fadfafeae47ad786c288667eadf'] = 'Betalingsstatus';
@@ -65,58 +139,4 @@ $_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontrolle
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_5eaf60217767a2ad1e30d36dc3a1c12c'] = 'Voer een geldige reden voor terugbetaling in (alleen alfanumeriek toegestaan).';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ee4f91ae6dc5a35a0060efa164cb65d9'] = 'Ongeldig restitutiebedrag. Max. Hoogte beschikbaar bedrag voor restitutie is';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6a8b1040e75c9723eef0a783ffc0e1d2'] = 'Deze transactie is al terugbetaald.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_446b416d535ed3f547fcd653dc11d49c'] = 'Ongeldig verzoek';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Deze betalingsmethode is niet beschikbaar.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_2b46a852749d321a4c6eafa3b36b643c'] = 'PayPal Afrekenen';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_78170aac364ebe8527577b742dc2111d'] = 'PayPal-transactiegegevens';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_34c15b4659b2241667e4c5d534270a17'] = 'Betaalomgeving';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2652eec977dcb2a5aea85f5bec235b05'] = 'Sandbox';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_756d97bb256b8580d4d71ee0c547804e'] = 'Productie';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_6f097b8feb2af129c8f74c786c130c1c'] = 'PayPal-referentie-ID';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'PayPal-transactie-ID';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_157c928dae48d88d19fb2ced2afbdd71'] = 'PayPal-bestel-ID';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_fdabf4e63a3cc1fe987269ff4e629148'] = 'Transactiebedrag';
$_MODULE['<{qlopaypalcommerce}prestashop>view_e98b5a6351fecb55b2f890686f31856d'] = 'QloApps-bestelreferentie';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea989f83006e233627987293f4bde0a'] = 'klantnaam';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_54945fdafec2c65f0f5561d65b165f1a'] = 'Klanten email';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_475007c00d7c166cca01a44ecfd068ff'] = 'Bekijk klant';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_4351cfebe4b61d8aa5efa1d020710005'] = 'Visie';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea78fadfafeae47ad786c288667eadf'] = 'Betalingsstatus';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_8f7afecbc8fbc4cd0f50a57d1172482e'] = 'VOLTOOID';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_31738cd694667ccdfa2cbc65249de5cc'] = 'Betaaldatum';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_580d87d5c5121696825f17708b1ec065'] = 'Totaal terugbetaald bedrag';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_8b123a0f5d61720a4273bc4ed1d613a3'] = 'Transactie terugbetalen';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a3a13394565fb6956d6948a1dbb8fe3f'] = 'Totaal terugbetaald bedrag';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_9d9dca90e919bd4c8febf55ea7a25b5f'] = 'Totaal beschikbaar bedrag om terug te betalen';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_51890b292429265077afcc0b2bb6f34a'] = 'Selecteer het type terugbetaling. Selecteer gedeeltelijke terugbetaling om een gedeeltelijk bedrag uit de transactie terug te betalen. Selecteer volledige terugbetaling om het totale transactiebedrag terug te betalen.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_d8fb839f1db11646b85354c3fb50fda3'] = 'Type terugbetaling';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_4f5a217b333e276be931951be6dc28f0'] = 'Selecteer Type terugbetaling';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_abcec07843d3ec02783b27587560f85f'] = 'Volledige terugbetaling';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_c985a711556e2edf5cac28dfbdb43ff0'] = 'Gedeeltelijke terugbetaling';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_84bca5dc34bb0d1244a9e0f323878665'] = 'Voer het bedrag in dat u van het transactiebedrag wilt terugbetalen.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_b782d4ff61550d7e8cdee4cf70a03788'] = 'restitutiebedrag';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_6bbeabf389367bc93090db6dd0c13c4e'] = 'max. hoogte';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_85689c24167c4690a0e346c46a17598c'] = 'Voer een opmerking in voor deze terugbetaling.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_97d8f33367ecaeee79d5255b447c8827'] = 'Restitutie Opmerking';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_76f0ed934de85cc7131910b32ede7714'] = 'Terugbetaling';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_072ab77c58ea38de4e3272c3eed624c1'] = 'Restitutielijst';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_88427ec035734b45aae9f7d8859a5008'] = 'Transactie ID';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_b2f40690858b404ed10e62bdf422c704'] = 'Bedrag';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a1fa27779242b4902f7ae3bdd5c6d508'] = 'Type';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_ec53a8c4f07baed5d8825072c89799be'] = 'Toestand';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_44749712dbec183e983dcd78a7736c41'] = 'Datum';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a207494d393a4f4909f746fd24440440'] = 'Nog geen restituties gemaakt.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_e3bc22b32f4abd925670253972326260'] = 'Totaal terugbetaald bedrag: ';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_7b12dad517fd9056aabf8099a8173ddf'] = 'Uw betaling is om de volgende reden mislukt:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_3d9f514d46849760ef1b1412e314fd99'] = 'Fout:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_0d6779532e0735f6a9b05723ab191bc3'] = 'Foutbeschrijving:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_569fd05bdafa1712c4f6be5b153b8418'] = 'Andere betalingsmethoden';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_cancel_ack_0e1b6078789badcbfae8640288a46f0f'] = 'U heeft de betaling via PayPal geannuleerd. U kunt het opnieuw proberen met PayPal of een andere betaalmethode proberen.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Je bestelling op% s is voltooid.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_cd44f47a868e5e42fa1a23b775504490'] = 'Totaal betaald bedrag';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_19c419a8a4f1cd621853376a930a2e24'] = 'Er is een e-mail gestuurd met deze informatie.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_30163d8fc3068e8297e7ab5bf32aec87'] = 'Uw bestelling wordt zo snel mogelijk verzonden.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_ca7e41a658753c87973936d7ce2429a8'] = 'Als u vragen, opmerkingen of opmerkingen heeft, neem dan contact met ons op';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_66fcf4c223bbf4c7c886d4784e1f62e4'] = 'deskundig klantenserviceteam';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_7c2ed2f8a5fc3c48f2d49196f96b34b1'] = 'We hebben een probleem met uw betaling vastgesteld. Neem dan contact op met onze';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_25e8f2fd2871c8423bbe4e254066cd98'] = 'Even geduld aub...';
diff --git a/modules/qlopaypalcommerce/translations/pl.php b/modules/qlopaypalcommerce/translations/pl.php
index 179563980..741429ab4 100644
--- a/modules/qlopaypalcommerce/translations/pl.php
+++ b/modules/qlopaypalcommerce/translations/pl.php
@@ -2,58 +2,66 @@
global $_MODULE;
$_MODULE = array();
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dba5abcd5b8bb0ee23a6bde15a6e5fde'] = 'QloApps PayPal Checkout';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1639a5f6b16f8d4a04393dbdff0e05f6'] = 'Błyskawiczny globalny biznes.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dd5e9bb870ec616039f0fe9f2bd4726b'] = 'Jedna integracja dla wszystkich Twoich potrzeb związanych z płatnościami online.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dba5abcd5b8bb0ee23a6bde15a6e5fde'] = 'Płatność PayPal QloApps';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1639a5f6b16f8d4a04393dbdff0e05f6'] = 'Natychmiastowy globalny biznes.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dd5e9bb870ec616039f0fe9f2bd4726b'] = 'Jedna integracja dla wszystkich Twoich potrzeb w zakresie płatności online.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e654f7a86a4458b9cd662267e0f29b52'] = 'Korzyści';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e0a9745011703bc991ab1af1f50ccd20'] = 'Zapewnij swoim klientom bezproblemowe zakupy, które napędzają konwersję i lojalność.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_af0fd51a752f317a87b2f7b724856034'] = 'Akceptuj płatności PayPal dzięki uproszczonemu wdrażaniu, elastycznej integracji i łatwej konfiguracji konta.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b50f4dec6df62993204153f8d5db2c'] = 'Dostęp do ponad 377 milionów klientów PayPal na całym świecie *, z obsługą w lokalnej walucie dla lepszego zarządzania pieniędzmi.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_cb47de9d9350a9025c8c3b657c8c8268'] = 'Spokój dla Ciebie i Twoich klientów dzięki ochronie kupujących i sprzedających w przypadku kwalifikujących się sprzedaży.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_8332b9ae4d8931da4a311f410a232619'] = 'Wynik PayPal za czwarte kwartały 2020 r';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1e4fe71e24592a98260048fe05cbbb5b'] = 'Należy skonfigurować identyfikator handlowca PayPal, adres e-mail, identyfikator klienta i hasło.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a02758d758e8bec77a33d7f392eb3f8a'] = 'Nie ustawiono waluty dla tego modułu.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e0a9745011703bc991ab1af1f50ccd20'] = 'Zapewnij swoim klientom bezproblemowe zakupy, które zwiększą konwersję i lojalność.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_af0fd51a752f317a87b2f7b724856034'] = 'Akceptuj płatności PayPal dzięki prostemu procesowi wdrażania, elastycznej integracji i łatwej konfiguracji konta.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b50f4dec6df62993204153f8d5db2c'] = 'Dostęp do ponad 377 milionów klientów PayPal na całym świecie*, obsługa walut lokalnych dla lepszego zarządzania pieniędzmi.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_cb47de9d9350a9025c8c3b657c8c8268'] = 'Spokój ducha dla Ciebie i Twoich klientów dzięki ochronie kupujących i sprzedających w przypadku kwalifikujących się transakcji.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_8332b9ae4d8931da4a311f410a232619'] = 'Wyniki PayPal za czwarty kwartał 2020 r.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1e4fe71e24592a98260048fe05cbbb5b'] = 'Należy skonfigurować identyfikator sprzedawcy PayPal, adres e-mail, identyfikator klienta i klucz tajny.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a02758d758e8bec77a33d7f392eb3f8a'] = 'Dla tego modułu nie ustawiono żadnej waluty.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_afcae56aeb45bbff848348abf4824b44'] = 'Konfiguracja płatności PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_116e78f6c1c4b4f66a57192817242e35'] = 'Środowisko transakcyjne';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_2652eec977dcb2a5aea85f5bec235b05'] = 'Piaskownica';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_756d97bb256b8580d4d71ee0c547804e'] = 'Produkcja';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_bb6e852329aacf2cc839e01ab1ce1773'] = 'Wybierz środowisko płatności PayPal, piaskownicę lub produkcję. Możesz otrzymać prawdziwą transakcję tylko na produkcji, do testów użyj piaskownicy.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_229a7ec501323b94db7ff3157a7623c9'] = 'Identyfikator sprzedawcy';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_daa9d1b5682c462e8fc8585bb4cf868c'] = 'Wprowadź identyfikator sprzedawcy swojego konta PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_275f5257af70b08ed6def799bfa214b3'] = 'Konto e-mail';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_9b022ec729030a4e40c533c61668d128'] = 'Wprowadź adres e-mail konta PayPal swojego konta PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_76525f0f34b48475e5ca33f71d296f3b'] = 'Identyfikator klienta';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_21fb87c3b83156a1c9e7c51239705335'] = 'Wprowadź identyfikator klienta z poświadczeń aplikacji konta PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_734082edf44417dd19cc65943aa65c36'] = 'Sekret klienta';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_92718280c77bfa861693c57bad5a0632'] = 'Wprowadź klucz klienta z poświadczeń aplikacji konta PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_783901fa167d90d82463e71da67c5e52'] = 'Ochrona sprzedających w systemie PayPal nie ma zastosowania';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c9cc8cce247e49bae79f15173ce97354'] = 'Zapisać';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a1c0702a8ce0c1562b372b93b5b8ae70'] = 'Wprowadź identyfikator sprzedawcy';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_bb6e852329aacf2cc839e01ab1ce1773'] = 'Wybierz środowisko płatności PayPal: sandbox lub produkcyjny. Prawdziwe transakcje można uzyskać tylko w środowisku produkcyjnym, do testów użyj sandboxa.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_ed4f8785248e2d9a8a8b25e5c483551a'] = 'Identyfikator sprzedawcy Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_6d132ffd3d699649441bdc627dd57eba'] = 'Wprowadź identyfikator sprzedawcy swojego konta testowego PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_36808d0f8a32391ba62716d9831040e5'] = 'Adres e-mail konta Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_ff8336737d5f067b6c11724bd6fc944e'] = 'Wprowadź adres e-mail konta PayPal powiązanego z Twoim kontem sandbox PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a0bd7d42b20f8ca0c6f28bdd30a1af1f'] = 'Identyfikator klienta Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e7b65a83fa18a3396a4b140483e6f288'] = 'Wprowadź identyfikator klienta z danych logowania do konta PayPal Sandbox.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_9af7eae52a08a132e079c3e910bb2cbe'] = 'Sekret klienta Sandbox';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_023d4f770106b82c4984d38c9033d393'] = 'Wprowadź tajny klucz klienta z danych uwierzytelniających konta piaskownicy PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_450e2248dad7a152379bf016310e1eba'] = 'Identyfikator sprzedawcy na żywo';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3058efc14b28f688630f4e6770db5f03'] = 'Wprowadź identyfikator sprzedawcy swojego konta PayPal Live.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c916854e86ef605147fce41d400b6d74'] = 'E-mail konta na żywo';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_05e0b13ee68a1adcd4939da789611213'] = 'Wprowadź adres e-mail swojego konta PayPal Live.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1087b413bc531d99ee4deb93e280bfed'] = 'Identyfikator klienta na żywo';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dfa5a074df3ad0ca4018a93243fcce1e'] = 'Wprowadź identyfikator klienta z danych logowania do aplikacji PayPal Live.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b75793dc0a1d8225b39b8be4392339'] = 'Sekret klienta na żywo';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1382bf9075c663adbf10818ed4789234'] = 'Wprowadź tajny klucz klienta z danych logowania do aplikacji konta PayPal Live.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_783901fa167d90d82463e71da67c5e52'] = 'Ochrona sprzedawców PayPal nie ma zastosowania';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c9cc8cce247e49bae79f15173ce97354'] = 'Ratować';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a1c0702a8ce0c1562b372b93b5b8ae70'] = 'Proszę podać identyfikator sprzedawcy';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_5f8d20654b3683fd837ad6766a99b388'] = 'Podano nieprawidłowy identyfikator sprzedawcy.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_451ad04779375f902c3c9de28f096f42'] = 'Wprowadź adres e-mail konta';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a23555edc4d09483a2d5d84478a6e8d3'] = 'Wprowadź prawidłowy adres e-mail konta';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_d78b4ac6843d2634c46a59c2d0c2629d'] = 'Wprowadź identyfikator klienta';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3640405a6244a23f537de55975337bf3'] = 'Wprowadź klucz klienta';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_89493d1e532e6577510bbd93052bf20c'] = 'Płatnik zainicjował spór dotyczący tej przechwyconej płatności w systemie PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_9c28e950fb310ee005da61698456bc61'] = 'Przechwycone środki zostały odwrócone w odpowiedzi na zakwestionowanie przez płatnika tej przechwyconej płatności z emitentem instrumentu finansowego wykorzystanego do opłacenia tej przechwyconej płatności.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_e2740ccb963c88d2739ee7ff5d493235'] = 'Płatnik zapłacił czekiem elektronicznym, który jeszcze nie został rozliczony.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_4e3da671b7e244adc46f9093e150fd99'] = 'Odwiedź swoje konto internetowe. W ** Przeglądzie konta ** zaakceptuj i odrzuć tę płatność.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_f3d713097a36e0a9f589755465883f91'] = 'Nie można podać żadnego dodatkowego konkretnego powodu. Aby uzyskać więcej informacji na temat tej przechwyconej płatności, odwiedź swoje konto online lub skontaktuj się z PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_04263f8fe176af4cd42d9756fc136cfe'] = 'Przechwycona płatność oczekuje na ręczne sprawdzenie.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_c343691c63a475e04acf19b98945bc59'] = 'Odbiorca nie ustawił jeszcze odpowiednich preferencji odbioru dla swojego konta. Aby uzyskać więcej informacji na temat akceptowania lub odrzucania tej płatności, odwiedź swoje konto online. Ten powód jest zwykle podawany w scenariuszach, na przykład gdy waluta przechwyconej płatności różni się od podstawowej waluty posiadania odbiorcy.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_71013ee01f1a31c0310bcf4a91162c29'] = 'Przechwycone środki zostały zwrócone.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_a4656378d78c3d73b354ddc0d4dabe18'] = 'Płatnik musi wysłać środki za tę przechwyconą płatność. Ten kod zwykle pojawia się w przypadku ręcznych EFT.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_1bca65212e4eba1b64766eeb66091af2'] = 'Odbiorca nie ma konta PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_451ad04779375f902c3c9de28f096f42'] = 'Proszę podać adres e-mail konta';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a23555edc4d09483a2d5d84478a6e8d3'] = 'Proszę podać prawidłowy adres e-mail konta';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_d78b4ac6843d2634c46a59c2d0c2629d'] = 'Proszę podać ID klienta';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3640405a6244a23f537de55975337bf3'] = 'Proszę wprowadzić tajny klucz klienta';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_89493d1e532e6577510bbd93052bf20c'] = 'Płatnik wszczął spór dotyczący tej przechwyconej płatności w serwisie PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_9c28e950fb310ee005da61698456bc61'] = 'Zatrzymane środki zostały zwrócone w odpowiedzi na zakwestionowanie przez płatnika zatrzymanej płatności u wystawcy instrumentu finansowego użytego do opłacenia tej zatrzymanej płatności.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_e2740ccb963c88d2739ee7ff5d493235'] = 'Płatnik zapłacił e-czekiem, który nie został jeszcze zrealizowany.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_4e3da671b7e244adc46f9093e150fd99'] = 'Odwiedź swoje konto online. W **Podsumowaniu konta** zaakceptuj i odrzuć tę płatność.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_f3d713097a36e0a9f589755465883f91'] = 'Nie można podać żadnego konkretnego powodu. Aby uzyskać więcej informacji na temat tej przechwyconej płatności, odwiedź swoje konto online lub skontaktuj się z PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_04263f8fe176af4cd42d9756fc136cfe'] = 'Zarejestrowana płatność oczekuje na ręczną weryfikację.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_c343691c63a475e04acf19b98945bc59'] = 'Odbiorca nie skonfigurował jeszcze odpowiednich preferencji odbioru dla swojego konta. Aby uzyskać więcej informacji o tym, jak zaakceptować lub odrzucić tę płatność, odwiedź stronę internetową swojego konta. Ten powód jest zazwyczaj podawany w sytuacjach, gdy waluta przechwyconej płatności różni się od waluty głównej odbiorcy.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_71013ee01f1a31c0310bcf4a91162c29'] = 'Zdobyte środki zwrócono.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_a4656378d78c3d73b354ddc0d4dabe18'] = 'Płatnik musi przesłać środki za tę przechwyconą płatność. Ten kod zazwyczaj pojawia się w przypadku ręcznych przelewów elektronicznych.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_1bca65212e4eba1b64766eeb66091af2'] = 'Odbiorca nie posiada konta PayPal.';
$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_53c3196bca5dde9b71e5be8287ae9cde'] = 'Konto PayPal odbiorcy nie zostało zweryfikowane';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_a7a37ae71b70fe671308691cc6fe03dc'] = 'Transakcje PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Numer zamówienia';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_55307c995094996234479b33fbc16bd1'] = 'Numer zamówienia w QloApps transakcji PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_55307c995094996234479b33fbc16bd1'] = 'Numer referencyjny zamówienia w QloApps transakcji PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'Identyfikator transakcji PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_dae74f84a69dab4b8e04999f2460febf'] = 'Identyfikator transakcji PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2763b4242763cbee7190de46d45d204f'] = 'Suma transakcji';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2763b4242763cbee7190de46d45d204f'] = 'Całkowita kwota transakcji';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_e8453b7e2a7ccf2edeae228682a61b8d'] = 'Całkowita kwota zapłacona w transakcji PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ce26601dac0dea138b7295f02b7620a7'] = 'Klient';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_41a9d5e195648f50143f1c1abf5e00e6'] = 'Klient w QloApps, który dokonał transakcji PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_41a9d5e195648f50143f1c1abf5e00e6'] = 'Klient QloApps, który wykonał transakcję PayPal.';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ec53a8c4f07baed5d8825072c89799be'] = 'Status';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2ea78fadfafeae47ad786c288667eadf'] = 'Status płatności';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_3516529c1d87f5fde62d6841140f5dc0'] = 'Aktualny status transakcji PayPal.';
@@ -62,12 +70,12 @@ $_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontrolle
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_630f6dc397fe74e52d5189e2c80f282b'] = 'Powrót do listy';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2a43821ec21eadc4073fc65dc35d2198'] = 'Nieprawidłowy typ zwrotu.';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_4e7f26d58027e5f9611cc5fe9d901e06'] = 'Nieprawidłowa kwota zwrotu.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_5eaf60217767a2ad1e30d36dc3a1c12c'] = 'Wpisz prawidłowy powód zwrotu (dozwolone tylko znaki alfanumeryczne).';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ee4f91ae6dc5a35a0060efa164cb65d9'] = 'Nieprawidłowa kwota zwrotu. Maks. dostępna kwota do zwrotu wynosi';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6a8b1040e75c9723eef0a783ffc0e1d2'] = 'Ta transakcja została już zwrócona.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_5eaf60217767a2ad1e30d36dc3a1c12c'] = 'Wprowadź prawidłowy powód zwrotu (dozwolone są tylko znaki alfanumeryczne).';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ee4f91ae6dc5a35a0060efa164cb65d9'] = 'Nieprawidłowa kwota zwrotu. Maksymalna dostępna kwota zwrotu to';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6a8b1040e75c9723eef0a783ffc0e1d2'] = 'Zwrot za tę transakcję został już dokonany.';
$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_446b416d535ed3f547fcd653dc11d49c'] = 'Nieprawidłowe żądanie';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Ta metoda płatności nie jest dostępna.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_2b46a852749d321a4c6eafa3b36b643c'] = 'Zamówienie PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Ta metoda płatności jest niedostępna.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_2b46a852749d321a4c6eafa3b36b643c'] = 'Płatność PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>view_78170aac364ebe8527577b742dc2111d'] = 'Szczegóły transakcji PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>view_34c15b4659b2241667e4c5d534270a17'] = 'Środowisko płatności';
$_MODULE['<{qlopaypalcommerce}prestashop>view_2652eec977dcb2a5aea85f5bec235b05'] = 'Piaskownica';
@@ -75,48 +83,60 @@ $_MODULE['<{qlopaypalcommerce}prestashop>view_756d97bb256b8580d4d71ee0c547804e']
$_MODULE['<{qlopaypalcommerce}prestashop>view_6f097b8feb2af129c8f74c786c130c1c'] = 'Identyfikator referencyjny PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>view_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'Identyfikator transakcji PayPal';
$_MODULE['<{qlopaypalcommerce}prestashop>view_157c928dae48d88d19fb2ced2afbdd71'] = 'Identyfikator zamówienia PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_fdabf4e63a3cc1fe987269ff4e629148'] = 'Suma transakcyjna';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_e98b5a6351fecb55b2f890686f31856d'] = 'Numer zamówienia QloApps';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_fdabf4e63a3cc1fe987269ff4e629148'] = 'Kwota transakcji';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Numer zamówienia';
$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea989f83006e233627987293f4bde0a'] = 'Nazwa klienta';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_54945fdafec2c65f0f5561d65b165f1a'] = 'Email klienta';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_475007c00d7c166cca01a44ecfd068ff'] = 'Wyświetl klienta';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_4351cfebe4b61d8aa5efa1d020710005'] = 'Widok';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_54945fdafec2c65f0f5561d65b165f1a'] = 'E-mail klienta';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_475007c00d7c166cca01a44ecfd068ff'] = 'Widok klienta';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_4351cfebe4b61d8aa5efa1d020710005'] = 'Pogląd';
$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea78fadfafeae47ad786c288667eadf'] = 'Status płatności';
$_MODULE['<{qlopaypalcommerce}prestashop>view_8f7afecbc8fbc4cd0f50a57d1172482e'] = 'ZAKOŃCZONY';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_31738cd694667ccdfa2cbc65249de5cc'] = 'Termin płatności';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_31738cd694667ccdfa2cbc65249de5cc'] = 'Data płatności';
$_MODULE['<{qlopaypalcommerce}prestashop>view_580d87d5c5121696825f17708b1ec065'] = 'Całkowita kwota zwrotu';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_8b123a0f5d61720a4273bc4ed1d613a3'] = 'Transakcja zwrotu pieniędzy';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_8b123a0f5d61720a4273bc4ed1d613a3'] = 'Zwrot transakcji';
$_MODULE['<{qlopaypalcommerce}prestashop>view_a3a13394565fb6956d6948a1dbb8fe3f'] = 'Całkowita kwota zwrotu';
$_MODULE['<{qlopaypalcommerce}prestashop>view_9d9dca90e919bd4c8febf55ea7a25b5f'] = 'Całkowita dostępna kwota do zwrotu';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_51890b292429265077afcc0b2bb6f34a'] = 'Wybierz rodzaj zwrotu. Wybierz częściowy zwrot pieniędzy, aby dokonać zwrotu części kwoty z transakcji. Wybierz pełny zwrot, aby zwrócić całkowitą kwotę transakcji.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_d8fb839f1db11646b85354c3fb50fda3'] = 'Typ zwrotu';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_4f5a217b333e276be931951be6dc28f0'] = 'Wybierz Typ zwrotu';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_abcec07843d3ec02783b27587560f85f'] = 'Pełen zwrot kosztów';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_c985a711556e2edf5cac28dfbdb43ff0'] = 'Częściowy zwrot kosztów';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_84bca5dc34bb0d1244a9e0f323878665'] = 'Wpisz kwotę, którą chcesz zwrócić z kwoty transakcji.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_b782d4ff61550d7e8cdee4cf70a03788'] = 'Kwota Refundacji';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_6bbeabf389367bc93090db6dd0c13c4e'] = 'max.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_85689c24167c4690a0e346c46a17598c'] = 'Wpisz uwagę dotyczącą tego zwrotu.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_97d8f33367ecaeee79d5255b447c8827'] = 'Uwaga dotycząca zwrotu kosztów';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_76f0ed934de85cc7131910b32ede7714'] = 'Zwrot';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_51890b292429265077afcc0b2bb6f34a'] = 'Wybierz rodzaj zwrotu. Wybierz zwrot częściowy, aby zwrócić część kwoty transakcji. Wybierz zwrot pełny, aby zwrócić całą kwotę transakcji.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_d8fb839f1db11646b85354c3fb50fda3'] = 'Rodzaj zwrotu';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_4f5a217b333e276be931951be6dc28f0'] = 'Wybierz rodzaj zwrotu';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_abcec07843d3ec02783b27587560f85f'] = 'Pełny zwrot pieniędzy';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_c985a711556e2edf5cac28dfbdb43ff0'] = 'Częściowy zwrot pieniędzy';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_84bca5dc34bb0d1244a9e0f323878665'] = 'Wprowadź kwotę, którą chcesz zwrócić z kwoty transakcji.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_b782d4ff61550d7e8cdee4cf70a03788'] = 'Kwota zwrotu';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_6bbeabf389367bc93090db6dd0c13c4e'] = 'maks.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_85689c24167c4690a0e346c46a17598c'] = 'Wprowadź uwagę dotyczącą tego zwrotu.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_97d8f33367ecaeee79d5255b447c8827'] = 'Uwaga dotycząca zwrotu';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_76f0ed934de85cc7131910b32ede7714'] = 'Refundacja';
$_MODULE['<{qlopaypalcommerce}prestashop>view_072ab77c58ea38de4e3272c3eed624c1'] = 'Lista zwrotów';
$_MODULE['<{qlopaypalcommerce}prestashop>view_88427ec035734b45aae9f7d8859a5008'] = 'Identyfikator transakcji';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_b2f40690858b404ed10e62bdf422c704'] = 'Ilość';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a1fa27779242b4902f7ae3bdd5c6d508'] = 'Rodzaj';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_b2f40690858b404ed10e62bdf422c704'] = 'Kwota';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a1fa27779242b4902f7ae3bdd5c6d508'] = 'Typ';
$_MODULE['<{qlopaypalcommerce}prestashop>view_ec53a8c4f07baed5d8825072c89799be'] = 'Status';
$_MODULE['<{qlopaypalcommerce}prestashop>view_44749712dbec183e983dcd78a7736c41'] = 'Data';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a207494d393a4f4909f746fd24440440'] = 'Nie utworzono jeszcze zwrotów środków.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_e3bc22b32f4abd925670253972326260'] = 'Całkowita kwota zwrotu: ';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_91921ada405fd6ba65dff028df047cb6'] = 'Uwaga';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a207494d393a4f4909f746fd24440440'] = 'Nie utworzono jeszcze żadnych zwrotów.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_e3bc22b32f4abd925670253972326260'] = 'Całkowita kwota zwrotu:';
$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_7b12dad517fd9056aabf8099a8173ddf'] = 'Twoja płatność nie powiodła się z następującego powodu:';
$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_3d9f514d46849760ef1b1412e314fd99'] = 'Błąd:';
$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_0d6779532e0735f6a9b05723ab191bc3'] = 'Opis błędu:';
$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_569fd05bdafa1712c4f6be5b153b8418'] = 'Inne metody płatności';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_cancel_ack_0e1b6078789badcbfae8640288a46f0f'] = 'Anulowałeś płatność przez PayPal. Możesz spróbować ponownie w systemie PayPal lub wypróbować inną metodę płatności.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Twoje zamówienie% s zostało zakończone.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_cd44f47a868e5e42fa1a23b775504490'] = 'Całkowita zapłacona kwota';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_19c419a8a4f1cd621853376a930a2e24'] = 'Wysłano wiadomość e-mail z tymi informacjami.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_30163d8fc3068e8297e7ab5bf32aec87'] = 'Twoje zamówienie zostanie wysłane tak szybko, jak to możliwe.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_ca7e41a658753c87973936d7ce2429a8'] = 'W przypadku pytań, uwag lub wątpliwości prosimy o kontakt';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_66fcf4c223bbf4c7c886d4784e1f62e4'] = 'zespół obsługi klienta ekspertów';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_7c2ed2f8a5fc3c48f2d49196f96b34b1'] = 'Zauważyliśmy problem z Twoją płatnością. Prosimy o kontakt z naszym';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_cancel_ack_0e1b6078789badcbfae8640288a46f0f'] = 'Anulowałeś płatność przez PayPal. Możesz spróbować ponownie przez PayPal lub wybrać inną metodę płatności.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Twoje zamówienie w %s zostało zrealizowane.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_cd44f47a868e5e42fa1a23b775504490'] = 'Całkowita kwota zapłacona';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_19c419a8a4f1cd621853376a930a2e24'] = 'Informacja ta została wysłana e-mailem.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_30163d8fc3068e8297e7ab5bf32aec87'] = 'Twoje zamówienie zostanie wysłane najszybciej jak to możliwe.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_ca7e41a658753c87973936d7ce2429a8'] = 'Jeśli masz pytania, uwagi lub wątpliwości, skontaktuj się z nami';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_66fcf4c223bbf4c7c886d4784e1f62e4'] = 'zespół ekspertów ds. obsługi klienta';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_7c2ed2f8a5fc3c48f2d49196f96b34b1'] = 'Zauważyliśmy problem z Twoją płatnością. Skontaktuj się z nami.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_17a17ba93e6ac0192bd563905e87538d'] = 'Zapłać za pomocą opcji płatności Paypal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_644253cd300d73471cf86296d532b964'] = 'Zapłać za pomocą PayPala';
$_MODULE['<{qlopaypalcommerce}prestashop>payment_25e8f2fd2871c8423bbe4e254066cd98'] = 'Proszę czekać...';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_229a7ec501323b94db7ff3157a7623c9'] = 'Identyfikator sprzedawcy';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_daa9d1b5682c462e8fc8585bb4cf868c'] = 'Wprowadź identyfikator sprzedawcy swojego konta PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_275f5257af70b08ed6def799bfa214b3'] = 'Konto e-mail';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_9b022ec729030a4e40c533c61668d128'] = 'Wprowadź adres e-mail konta PayPal swojego konta PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_76525f0f34b48475e5ca33f71d296f3b'] = 'Identyfikator klienta';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_21fb87c3b83156a1c9e7c51239705335'] = 'Wprowadź identyfikator klienta z poświadczeń aplikacji konta PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_734082edf44417dd19cc65943aa65c36'] = 'Sekret klienta';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_92718280c77bfa861693c57bad5a0632'] = 'Wprowadź klucz klienta z poświadczeń aplikacji konta PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_e98b5a6351fecb55b2f890686f31856d'] = 'Numer zamówienia QloApps';
diff --git a/modules/qlopaypalcommerce/translations/ru.php b/modules/qlopaypalcommerce/translations/ru.php
index fa78162f2..081009ef2 100644
--- a/modules/qlopaypalcommerce/translations/ru.php
+++ b/modules/qlopaypalcommerce/translations/ru.php
@@ -3,21 +3,134 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dba5abcd5b8bb0ee23a6bde15a6e5fde'] = 'QloApps PayPal Checkout';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1639a5f6b16f8d4a04393dbdff0e05f6'] = 'Мгновенный глобальный бизнес.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dd5e9bb870ec616039f0fe9f2bd4726b'] = 'Единая интеграция для всех ваших потребностей в онлайн-платежах.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1639a5f6b16f8d4a04393dbdff0e05f6'] = 'Мгновенное превращение в глобальный бизнес.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dd5e9bb870ec616039f0fe9f2bd4726b'] = 'Одна интеграция для всех ваших потребностей в онлайн-платежах.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e654f7a86a4458b9cd662267e0f29b52'] = 'Преимущества';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e0a9745011703bc991ab1af1f50ccd20'] = 'Обеспечьте беспрепятственный покупательский опыт для ваших клиентов, который способствует конверсии и лояльности.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_af0fd51a752f317a87b2f7b724856034'] = 'Принимайте платежи PayPal с упрощенной регистрацией, адаптируемой интеграцией и простой настройкой учетной записи.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b50f4dec6df62993204153f8d5db2c'] = 'Доступ к более чем 377 миллионам клиентов PayPal по всему миру * с поддержкой местной валюты для лучшего управления деньгами.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_cb47de9d9350a9025c8c3b657c8c8268'] = 'Гарантия безопасности для вас и ваших клиентов благодаря защите покупателей и продавцов при приемлемых продажах.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_8332b9ae4d8931da4a311f410a232619'] = 'Результат PayPal за четвертый квартал 2020 года';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1e4fe71e24592a98260048fe05cbbb5b'] = 'Необходимо настроить PayPal Merchant ID, Email, Client ID и Secret.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a02758d758e8bec77a33d7f392eb3f8a'] = 'Валюта для этого модуля не установлена.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_afcae56aeb45bbff848348abf4824b44'] = 'Платежная конфигурация PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_116e78f6c1c4b4f66a57192817242e35'] = 'Операционная среда';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e0a9745011703bc991ab1af1f50ccd20'] = 'Обеспечьте своим клиентам бесперебойный процесс покупки, который повысит конверсию и лояльность.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_af0fd51a752f317a87b2f7b724856034'] = 'Принимайте платежи через PayPal благодаря упрощенной процедуре регистрации, гибкой интеграции и простой настройке учетной записи.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b50f4dec6df62993204153f8d5db2c'] = 'Доступ к более чем 377 миллионам клиентов PayPal по всему миру*, с поддержкой местных валют для более эффективного управления финансами.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_cb47de9d9350a9025c8c3b657c8c8268'] = 'Спокойствие для вас и ваших клиентов благодаря защите покупателей и продавцов по соответствующим сделкам.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_8332b9ae4d8931da4a311f410a232619'] = 'Результаты PayPal за четвертый квартал 2020 года';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1e4fe71e24592a98260048fe05cbbb5b'] = 'Необходимо настроить идентификатор продавца PayPal, адрес электронной почты, идентификатор клиента и секретный ключ.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a02758d758e8bec77a33d7f392eb3f8a'] = 'Для этого модуля валюта не установлена.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_afcae56aeb45bbff848348abf4824b44'] = 'Настройка платежей PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_116e78f6c1c4b4f66a57192817242e35'] = 'Среда транзакций';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_2652eec977dcb2a5aea85f5bec235b05'] = 'Песочница';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_756d97bb256b8580d4d71ee0c547804e'] = 'Производство';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_bb6e852329aacf2cc839e01ab1ce1773'] = 'Выберите платежную среду PayPal: песочницу или рабочую среду. Получить реальную транзакцию можно только на продакшене, для тестирования используйте песочницу.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_bb6e852329aacf2cc839e01ab1ce1773'] = 'Выберите среду обработки платежей PayPal: тестовую (sandbox) или рабочую (production). Реальные транзакции можно получить только в рабочей среде, для тестирования используйте тестовую среду.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_ed4f8785248e2d9a8a8b25e5c483551a'] = 'Идентификатор продавца в тестовой среде';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_6d132ffd3d699649441bdc627dd57eba'] = 'Введите идентификатор продавца (Merchant ID) вашего тестового аккаунта PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_36808d0f8a32391ba62716d9831040e5'] = 'Адрес электронной почты учетной записи песочницы';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_ff8336737d5f067b6c11724bd6fc944e'] = 'Введите адрес электронной почты вашей учетной записи PayPal в тестовой среде PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a0bd7d42b20f8ca0c6f28bdd30a1af1f'] = 'Идентификатор клиента песочницы';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_e7b65a83fa18a3396a4b140483e6f288'] = 'Введите идентификатор клиента из учетных данных приложения тестовой учетной записи PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_9af7eae52a08a132e079c3e910bb2cbe'] = 'Секрет клиента песочницы';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_023d4f770106b82c4984d38c9033d393'] = 'Введите секретный ключ клиента из учетных данных приложения в тестовой среде PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_450e2248dad7a152379bf016310e1eba'] = 'Идентификатор продавца в реальном времени';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3058efc14b28f688630f4e6770db5f03'] = 'Введите идентификатор продавца (Merchant ID) вашего аккаунта PayPal Live.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c916854e86ef605147fce41d400b6d74'] = 'Электронная почта для связи с аккаунтом в режиме реального времени';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_05e0b13ee68a1adcd4939da789611213'] = 'Введите адрес электронной почты вашей учетной записи PayPal Live.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1087b413bc531d99ee4deb93e280bfed'] = 'Действующий идентификатор клиента';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_dfa5a074df3ad0ca4018a93243fcce1e'] = 'Введите идентификатор клиента из учетных данных приложения PayPal Live Account.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_b9b75793dc0a1d8225b39b8be4392339'] = 'Секрет клиента в реальном времени';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_1382bf9075c663adbf10818ed4789234'] = 'Введите секретный ключ клиента из учетных данных приложения PayPal Live Account.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_783901fa167d90d82463e71da67c5e52'] = 'Программа защиты продавцов PayPal не применяется.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c9cc8cce247e49bae79f15173ce97354'] = 'Сохранять';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a1c0702a8ce0c1562b372b93b5b8ae70'] = 'Пожалуйста, введите идентификатор продавца.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_5f8d20654b3683fd837ad6766a99b388'] = 'Указан неверный идентификатор продавца.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_451ad04779375f902c3c9de28f096f42'] = 'Пожалуйста, введите адрес электронной почты вашей учетной записи.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a23555edc4d09483a2d5d84478a6e8d3'] = 'Пожалуйста, введите действительный адрес электронной почты вашей учетной записи.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_d78b4ac6843d2634c46a59c2d0c2629d'] = 'Пожалуйста, введите идентификатор клиента.';
+$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3640405a6244a23f537de55975337bf3'] = 'Пожалуйста, введите секретный ключ клиента.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_89493d1e532e6577510bbd93052bf20c'] = 'Плательщик инициировал спор по этому списанному платежу в PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_9c28e950fb310ee005da61698456bc61'] = 'Удержанные средства были аннулированы в ответ на возражение плательщика против данного удержанного платежа, поданное эмитентом финансового инструмента, использованного для осуществления этого платежа.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_e2740ccb963c88d2739ee7ff5d493235'] = 'Плательщик оплатил электронным чеком, который еще не был подтвержден.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_4e3da671b7e244adc46f9093e150fd99'] = 'Зайдите в свой онлайн-аккаунт. В разделе **Обзор аккаунта** подтвердите или отклоните этот платеж.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_f3d713097a36e0a9f589755465883f91'] = 'Дополнительные конкретные причины предоставить невозможно. Для получения более подробной информации об этом списанном платеже посетите свой личный кабинет или свяжитесь с PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_04263f8fe176af4cd42d9756fc136cfe'] = 'Обработанный платеж ожидает ручной проверки.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_c343691c63a475e04acf19b98945bc59'] = 'Получатель платежа еще не настроил соответствующие параметры получения средств для своего счета. Для получения дополнительной информации о том, как принять или отклонить этот платеж, посетите свой личный кабинет онлайн. Эта причина обычно указывается в случаях, когда валюта полученного платежа отличается от основной валюты получателя.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_71013ee01f1a31c0310bcf4a91162c29'] = 'Захваченные средства были возвращены.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_a4656378d78c3d73b354ddc0d4dabe18'] = 'Плательщик должен перевести средства для этого зачисленного платежа. Этот код обычно появляется при ручных электронных переводах средств.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_1bca65212e4eba1b64766eeb66091af2'] = 'У получателя платежа нет учетной записи PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_53c3196bca5dde9b71e5be8287ae9cde'] = 'Аккаунт PayPal получателя платежа не подтвержден.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_a7a37ae71b70fe671308691cc6fe03dc'] = 'Транзакции PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Номер заказа';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_55307c995094996234479b33fbc16bd1'] = 'Номер заказа в QloApps для транзакции PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'Идентификатор транзакции PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_dae74f84a69dab4b8e04999f2460febf'] = 'Идентификатор транзакции PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2763b4242763cbee7190de46d45d204f'] = 'Итого по транзакциям';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_e8453b7e2a7ccf2edeae228682a61b8d'] = 'Общая сумма, уплаченная в транзакции PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ce26601dac0dea138b7295f02b7620a7'] = 'Клиент';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_51890b292429265077afcc0b2bb6f34a'] = 'Выберите тип возврата. Выберите частичный возврат для частичного возмещения суммы транзакции. Выберите полный возврат для полного возмещения суммы транзакции.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_d8fb839f1db11646b85354c3fb50fda3'] = 'Тип возврата';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_4f5a217b333e276be931951be6dc28f0'] = 'Выберите тип возврата средств';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_abcec07843d3ec02783b27587560f85f'] = 'Полный возврат средств';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_c985a711556e2edf5cac28dfbdb43ff0'] = 'Частичный возврат средств';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_84bca5dc34bb0d1244a9e0f323878665'] = 'Введите сумму, которую вы хотите вернуть, из суммы транзакции.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_b782d4ff61550d7e8cdee4cf70a03788'] = 'Сумма возврата';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_6bbeabf389367bc93090db6dd0c13c4e'] = 'макс.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_85689c24167c4690a0e346c46a17598c'] = 'Укажите примечание к этому возврату средств.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_97d8f33367ecaeee79d5255b447c8827'] = 'Примечание о возврате средств';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_76f0ed934de85cc7131910b32ede7714'] = 'Возвращать деньги';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_072ab77c58ea38de4e3272c3eed624c1'] = 'Список возвратов';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_88427ec035734b45aae9f7d8859a5008'] = 'Идентификатор транзакции';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_b2f40690858b404ed10e62bdf422c704'] = 'Количество';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a1fa27779242b4902f7ae3bdd5c6d508'] = 'Тип';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_ec53a8c4f07baed5d8825072c89799be'] = 'Статус';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_44749712dbec183e983dcd78a7736c41'] = 'Дата';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_91921ada405fd6ba65dff028df047cb6'] = 'Примечание';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a207494d393a4f4909f746fd24440440'] = 'Возврат средств пока не создан.';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_e3bc22b32f4abd925670253972326260'] = 'Общая сумма возврата:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_7b12dad517fd9056aabf8099a8173ddf'] = 'Ваш платеж не прошел по следующей причине:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_3d9f514d46849760ef1b1412e314fd99'] = 'Ошибка:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_0d6779532e0735f6a9b05723ab191bc3'] = 'Описание ошибки:';
+$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_569fd05bdafa1712c4f6be5b153b8418'] = 'Другие способы оплаты';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_cancel_ack_0e1b6078789badcbfae8640288a46f0f'] = 'Вы отменили платеж через PayPal. Вы можете повторить попытку оплаты через PayPal или выбрать другой способ оплаты.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Ваш заказ на %s завершен.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_cd44f47a868e5e42fa1a23b775504490'] = 'Общая сумма платежа';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_19c419a8a4f1cd621853376a930a2e24'] = 'Данная информация отправлена по электронной почте.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_30163d8fc3068e8297e7ab5bf32aec87'] = 'Ваш заказ будет отправлен в кратчайшие сроки.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_ca7e41a658753c87973936d7ce2429a8'] = 'Если у вас есть вопросы, комментарии или замечания, пожалуйста, свяжитесь с нами.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_66fcf4c223bbf4c7c886d4784e1f62e4'] = 'команда экспертов по поддержке клиентов';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_7c2ed2f8a5fc3c48f2d49196f96b34b1'] = 'Мы обнаружили проблему с вашим платежом. Пожалуйста, свяжитесь с нами.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_41a9d5e195648f50143f1c1abf5e00e6'] = 'Клиент из QloApps, совершивший транзакцию через PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ec53a8c4f07baed5d8825072c89799be'] = 'Статус';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2ea78fadfafeae47ad786c288667eadf'] = 'Статус платежа';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_3516529c1d87f5fde62d6841140f5dc0'] = 'Текущий статус транзакции PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6fbc355a02359656f1e4540d58b784e1'] = 'Дата заказа';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_168f21218c30dcc245dc1c62c103cb7b'] = 'Дата создания заказа.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_630f6dc397fe74e52d5189e2c80f282b'] = 'Вернуться к списку';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2a43821ec21eadc4073fc65dc35d2198'] = 'Неверный тип возврата средств.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_4e7f26d58027e5f9611cc5fe9d901e06'] = 'Неверная сумма возврата.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_5eaf60217767a2ad1e30d36dc3a1c12c'] = 'Укажите допустимую причину возврата средств (допускаются только буквенно-цифровые символы).';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ee4f91ae6dc5a35a0060efa164cb65d9'] = 'Неверная сумма возврата. Максимальная сумма, доступная для возврата, составляет...';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6a8b1040e75c9723eef0a783ffc0e1d2'] = 'Возврат средств по данной транзакции уже произведен.';
+$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_446b416d535ed3f547fcd653dc11d49c'] = 'Неверный запрос';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Этот способ оплаты недоступен.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_2b46a852749d321a4c6eafa3b36b643c'] = 'Оплата через PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_78170aac364ebe8527577b742dc2111d'] = 'Детали транзакции PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_34c15b4659b2241667e4c5d534270a17'] = 'Платежная среда';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2652eec977dcb2a5aea85f5bec235b05'] = 'Песочница';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_756d97bb256b8580d4d71ee0c547804e'] = 'Производство';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_6f097b8feb2af129c8f74c786c130c1c'] = 'Идентификатор ссылки PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'Идентификатор транзакции PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_157c928dae48d88d19fb2ced2afbdd71'] = 'Идентификатор заказа PayPal';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_fdabf4e63a3cc1fe987269ff4e629148'] = 'Сумма транзакции';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Номер заказа';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea989f83006e233627987293f4bde0a'] = 'Имя клиента';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_54945fdafec2c65f0f5561d65b165f1a'] = 'Электронное письмо клиента';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_475007c00d7c166cca01a44ecfd068ff'] = 'Просмотреть клиента';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_4351cfebe4b61d8aa5efa1d020710005'] = 'Вид';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea78fadfafeae47ad786c288667eadf'] = 'Статус платежа';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_8f7afecbc8fbc4cd0f50a57d1172482e'] = 'ЗАВЕРШЕННЫЙ';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_31738cd694667ccdfa2cbc65249de5cc'] = 'Дата платежа';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_580d87d5c5121696825f17708b1ec065'] = 'Общая сумма возврата';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_8b123a0f5d61720a4273bc4ed1d613a3'] = 'Возврат средств по транзакции';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_a3a13394565fb6956d6948a1dbb8fe3f'] = 'Общая сумма возврата';
+$_MODULE['<{qlopaypalcommerce}prestashop>view_9d9dca90e919bd4c8febf55ea7a25b5f'] = 'Общая сумма, доступная для возврата';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_17a17ba93e6ac0192bd563905e87538d'] = 'Оплатите с помощью платежной системы PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_644253cd300d73471cf86296d532b964'] = 'Оплата через PayPal.';
+$_MODULE['<{qlopaypalcommerce}prestashop>payment_25e8f2fd2871c8423bbe4e254066cd98'] = 'Пожалуйста, подождите...';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_229a7ec501323b94db7ff3157a7623c9'] = 'идентификатор продавца';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_daa9d1b5682c462e8fc8585bb4cf868c'] = 'Введите идентификатор продавца вашей учетной записи PayPal.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_275f5257af70b08ed6def799bfa214b3'] = 'Адрес электронной почты';
@@ -26,97 +139,4 @@ $_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_76525f0f34b48475e5ca3
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_21fb87c3b83156a1c9e7c51239705335'] = 'Введите идентификатор клиента из учетных данных приложения PayPal.';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_734082edf44417dd19cc65943aa65c36'] = 'Секрет клиента';
$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_92718280c77bfa861693c57bad5a0632'] = 'Введите секрет клиента из учетных данных приложения PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_783901fa167d90d82463e71da67c5e52'] = 'Защита продавца PayPal неприменима';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_c9cc8cce247e49bae79f15173ce97354'] = 'Сохранять';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a1c0702a8ce0c1562b372b93b5b8ae70'] = 'Пожалуйста, введите идентификатор продавца';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_5f8d20654b3683fd837ad6766a99b388'] = 'Указан неверный идентификатор продавца.';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_451ad04779375f902c3c9de28f096f42'] = 'Пожалуйста, введите адрес электронной почты аккаунта';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_a23555edc4d09483a2d5d84478a6e8d3'] = 'Пожалуйста, введите действующий адрес электронной почты аккаунта';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_d78b4ac6843d2634c46a59c2d0c2629d'] = 'Пожалуйста, введите идентификатор клиента';
-$_MODULE['<{qlopaypalcommerce}prestashop>qlopaypalcommerce_3640405a6244a23f537de55975337bf3'] = 'Пожалуйста, введите секрет клиента';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_89493d1e532e6577510bbd93052bf20c'] = 'Плательщик инициировал спор для этого захваченного платежа с PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_9c28e950fb310ee005da61698456bc61'] = 'Захваченные средства были сторнированы в ответ на оспаривание плательщиком этого зафиксированного платежа с эмитентом финансового инструмента, использованного для оплаты этого зафиксированного платежа.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_e2740ccb963c88d2739ee7ff5d493235'] = 'Плательщик заплатил через eCheck, который еще не прошел клиринг.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_4e3da671b7e244adc46f9093e150fd99'] = 'Посетите свой онлайн-аккаунт. В ** Обзоре учетной записи ** примите и отклоните этот платеж.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_f3d713097a36e0a9f589755465883f91'] = 'Никакой дополнительной конкретной причины указать нельзя. Для получения дополнительных сведений об этом зафиксированном платеже посетите свою учетную запись в Интернете или обратитесь в PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_04263f8fe176af4cd42d9756fc136cfe'] = 'Захваченный платеж ожидает проверки вручную.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_c343691c63a475e04acf19b98945bc59'] = 'Получатель еще не настроил соответствующие настройки получения для своей учетной записи. Для получения дополнительной информации о том, как принять или отклонить этот платеж, посетите свою учетную запись в Интернете. Эта причина обычно предлагается в сценариях, например, когда валюта фиксированного платежа отличается от основной валюты хранения получателя.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_71013ee01f1a31c0310bcf4a91162c29'] = 'Захваченные средства были возвращены.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_a4656378d78c3d73b354ddc0d4dabe18'] = 'Плательщик должен отправить средства для этого захваченного платежа. Этот код обычно появляется для электронных переводов вручную.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_1bca65212e4eba1b64766eeb66091af2'] = 'У получателя нет учетной записи PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>wkpaypalcommerceorder_53c3196bca5dde9b71e5be8287ae9cde'] = 'Счет PayPal получателя не подтвержден';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_a7a37ae71b70fe671308691cc6fe03dc'] = 'PayPal транзакции';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Код заказа';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_55307c995094996234479b33fbc16bd1'] = 'Ссылка на заказ в QloApps транзакции PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'Идентификатор транзакции PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_dae74f84a69dab4b8e04999f2460febf'] = 'Идентификатор транзакции PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2763b4242763cbee7190de46d45d204f'] = 'Всего транзакции';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_e8453b7e2a7ccf2edeae228682a61b8d'] = 'Общая сумма, уплаченная в транзакции PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ce26601dac0dea138b7295f02b7620a7'] = 'Покупатель';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_41a9d5e195648f50143f1c1abf5e00e6'] = 'Клиент в QloApps, выполнивший транзакцию PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ec53a8c4f07baed5d8825072c89799be'] = 'Положение дел';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2ea78fadfafeae47ad786c288667eadf'] = 'Статус платежа';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_3516529c1d87f5fde62d6841140f5dc0'] = 'Текущий статус транзакции PayPal.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6fbc355a02359656f1e4540d58b784e1'] = 'Дата заказа';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_168f21218c30dcc245dc1c62c103cb7b'] = 'Дата создания заказа.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_630f6dc397fe74e52d5189e2c80f282b'] = 'Обратно к списку';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_2a43821ec21eadc4073fc65dc35d2198'] = 'Неверный тип возврата.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_4e7f26d58027e5f9611cc5fe9d901e06'] = 'Неверная сумма возврата.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_5eaf60217767a2ad1e30d36dc3a1c12c'] = 'Введите действительную причину возврата (разрешены только буквы и цифры).';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_ee4f91ae6dc5a35a0060efa164cb65d9'] = 'Неверная сумма возврата. Максимум. доступная сумма для возврата составляет';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_6a8b1040e75c9723eef0a783ffc0e1d2'] = 'Возврат по этой транзакции уже произведен.';
-$_MODULE['<{qlopaypalcommerce}prestashop>adminpaypalcommercetransactioncontroller_446b416d535ed3f547fcd653dc11d49c'] = 'Неверный запрос';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Этот способ оплаты недоступен.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_2b46a852749d321a4c6eafa3b36b643c'] = 'PayPal Checkout';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_78170aac364ebe8527577b742dc2111d'] = 'Детали транзакции PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_34c15b4659b2241667e4c5d534270a17'] = 'Платежная среда';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2652eec977dcb2a5aea85f5bec235b05'] = 'Песочница';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_756d97bb256b8580d4d71ee0c547804e'] = 'Производство';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_6f097b8feb2af129c8f74c786c130c1c'] = 'Ссылочный идентификатор PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2b6ab125b0384eb33453b95c3f8e4ae6'] = 'Идентификатор транзакции PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_157c928dae48d88d19fb2ced2afbdd71'] = 'Идентификатор заказа PayPal';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_fdabf4e63a3cc1fe987269ff4e629148'] = 'Сумма транзакции';
$_MODULE['<{qlopaypalcommerce}prestashop>view_e98b5a6351fecb55b2f890686f31856d'] = 'Справочник по заказу QloApps';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea989f83006e233627987293f4bde0a'] = 'Имя Клиента';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_54945fdafec2c65f0f5561d65b165f1a'] = 'Электронная почта клиента';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_475007c00d7c166cca01a44ecfd068ff'] = 'Просмотр клиента';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_4351cfebe4b61d8aa5efa1d020710005'] = 'Вид';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_2ea78fadfafeae47ad786c288667eadf'] = 'Статус платежа';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_8f7afecbc8fbc4cd0f50a57d1172482e'] = 'ЗАВЕРШЕННЫЙ';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_31738cd694667ccdfa2cbc65249de5cc'] = 'Дата платежа';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_580d87d5c5121696825f17708b1ec065'] = 'Общая сумма возврата';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_8b123a0f5d61720a4273bc4ed1d613a3'] = 'Транзакция возврата';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a3a13394565fb6956d6948a1dbb8fe3f'] = 'Общая сумма возврата';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_9d9dca90e919bd4c8febf55ea7a25b5f'] = 'Общая доступная сумма для возврата';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_51890b292429265077afcc0b2bb6f34a'] = 'Выберите тип возврата. Выберите частичное возмещение для возмещения частичной суммы транзакции. Выберите полный возврат, чтобы вернуть полную сумму транзакции.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_d8fb839f1db11646b85354c3fb50fda3'] = 'Тип возврата';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_4f5a217b333e276be931951be6dc28f0'] = 'Выберите тип возврата';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_abcec07843d3ec02783b27587560f85f'] = 'Полное возмещение';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_c985a711556e2edf5cac28dfbdb43ff0'] = 'Частичное возмещение';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_84bca5dc34bb0d1244a9e0f323878665'] = 'Введите сумму, которую вы хотите вернуть из суммы транзакции.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_b782d4ff61550d7e8cdee4cf70a03788'] = 'Сумма возмещения';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_6bbeabf389367bc93090db6dd0c13c4e'] = 'Максимум.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_85689c24167c4690a0e346c46a17598c'] = 'Введите примечание для этого возмещения.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_97d8f33367ecaeee79d5255b447c8827'] = 'Замечание о возврате';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_76f0ed934de85cc7131910b32ede7714'] = 'Возврат';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_072ab77c58ea38de4e3272c3eed624c1'] = 'Список возврата';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_88427ec035734b45aae9f7d8859a5008'] = 'ID транзакции';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_b2f40690858b404ed10e62bdf422c704'] = 'Количество';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a1fa27779242b4902f7ae3bdd5c6d508'] = 'Тип';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_ec53a8c4f07baed5d8825072c89799be'] = 'Положение дел';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_44749712dbec183e983dcd78a7736c41'] = 'Дата';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_a207494d393a4f4909f746fd24440440'] = 'Возврат еще не создан.';
-$_MODULE['<{qlopaypalcommerce}prestashop>view_e3bc22b32f4abd925670253972326260'] = 'Общая сумма возврата: ';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_7b12dad517fd9056aabf8099a8173ddf'] = 'Ваш платеж не прошел по следующей причине:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_3d9f514d46849760ef1b1412e314fd99'] = 'Ошибка:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_0d6779532e0735f6a9b05723ab191bc3'] = 'Описание ошибки:';
-$_MODULE['<{qlopaypalcommerce}prestashop>paypal_error_569fd05bdafa1712c4f6be5b153b8418'] = 'Другие способы оплаты';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_cancel_ack_0e1b6078789badcbfae8640288a46f0f'] = 'Вы отменили платеж через PayPal. Вы можете повторить попытку через PayPal или попробовать другой способ оплаты.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Ваш заказ на% s выполнен.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_cd44f47a868e5e42fa1a23b775504490'] = 'Общая выплаченная сумма';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_19c419a8a4f1cd621853376a930a2e24'] = 'Электронное письмо было отправлено с этой информацией.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_30163d8fc3068e8297e7ab5bf32aec87'] = 'Ваш заказ будет отправлен в кратчайшие сроки.';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_ca7e41a658753c87973936d7ce2429a8'] = 'Если у вас есть вопросы, комментарии или проблемы, свяжитесь с нашим';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_66fcf4c223bbf4c7c886d4784e1f62e4'] = 'экспертная команда поддержки клиентов';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_return_7c2ed2f8a5fc3c48f2d49196f96b34b1'] = 'Мы заметили проблему с вашим платежом. Свяжитесь с нашим';
-$_MODULE['<{qlopaypalcommerce}prestashop>payment_25e8f2fd2871c8423bbe4e254066cd98'] = 'Подождите пожалуйста...';
diff --git a/modules/qlopaypalcommerce/views/css/admin/index.php b/modules/qlopaypalcommerce/views/css/admin/index.php
index 409280877..8d30901e6 100644
--- a/modules/qlopaypalcommerce/views/css/admin/index.php
+++ b/modules/qlopaypalcommerce/views/css/admin/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
diff --git a/modules/qlopaypalcommerce/views/css/admin/wk_module_menu.css b/modules/qlopaypalcommerce/views/css/admin/wk_module_menu.css
index 9329d25d5..12a1fe17b 100644
--- a/modules/qlopaypalcommerce/views/css/admin/wk_module_menu.css
+++ b/modules/qlopaypalcommerce/views/css/admin/wk_module_menu.css
@@ -1,10 +1,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -17,7 +17,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
.icon-AdminPaypalCommerceTransaction:before {
diff --git a/modules/qlopaypalcommerce/views/css/admin/wk_paypal_transaction.css b/modules/qlopaypalcommerce/views/css/admin/wk_paypal_transaction.css
index 27fab253a..2806e7768 100644
--- a/modules/qlopaypalcommerce/views/css/admin/wk_paypal_transaction.css
+++ b/modules/qlopaypalcommerce/views/css/admin/wk_paypal_transaction.css
@@ -1,10 +1,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -17,7 +17,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
.ppstatusDetail .ppstatusDetailMsg {
diff --git a/modules/qlopaypalcommerce/views/css/front/index.php b/modules/qlopaypalcommerce/views/css/front/index.php
index 150f23072..80123c370 100644
--- a/modules/qlopaypalcommerce/views/css/front/index.php
+++ b/modules/qlopaypalcommerce/views/css/front/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
diff --git a/modules/qlopaypalcommerce/views/css/front/wk_payment.css b/modules/qlopaypalcommerce/views/css/front/wk_payment.css
index 5843f2c29..2c84df9c0 100644
--- a/modules/qlopaypalcommerce/views/css/front/wk_payment.css
+++ b/modules/qlopaypalcommerce/views/css/front/wk_payment.css
@@ -1,10 +1,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -17,7 +17,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
#wk-overlay {
@@ -46,14 +46,8 @@
0% {transform: rotate(0deg);}
100% {transform: rotate(360deg);}}
-p.payment_module a#qlo_paypal_btn {
- background: url(../../img/paypal-payment-icon.png) 15px 8px no-repeat #fbfbfb;
-}
-
-.qlo_paypal_methods_wrapper {
- text-align: center;
- padding: 20px 15px;
- background: #fbfbfb;
- border-radius: 3px;
- border: 1px solid #d6d4d4;
+p.payment_module a.qlo_paypal_payment {
+ background: url('../../img/paypal-payment-icon.png') no-repeat scroll 15px 23px #FBFBFB;
+ background-size: 64px 34px;
+ cursor: pointer;
}
diff --git a/modules/qlopaypalcommerce/views/css/front/wk_payment_cancel.css b/modules/qlopaypalcommerce/views/css/front/wk_payment_cancel.css
index 9b9eb6939..b3e183625 100644
--- a/modules/qlopaypalcommerce/views/css/front/wk_payment_cancel.css
+++ b/modules/qlopaypalcommerce/views/css/front/wk_payment_cancel.css
@@ -1,10 +1,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -17,7 +17,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
.payment-cancel-ack {
diff --git a/modules/qlopaypalcommerce/views/css/index.php b/modules/qlopaypalcommerce/views/css/index.php
index 409280877..8d30901e6 100644
--- a/modules/qlopaypalcommerce/views/css/index.php
+++ b/modules/qlopaypalcommerce/views/css/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
diff --git a/modules/qlopaypalcommerce/views/img/index.php b/modules/qlopaypalcommerce/views/img/index.php
index 409280877..8d30901e6 100644
--- a/modules/qlopaypalcommerce/views/img/index.php
+++ b/modules/qlopaypalcommerce/views/img/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
diff --git a/modules/qlopaypalcommerce/views/index.php b/modules/qlopaypalcommerce/views/index.php
index 409280877..8d30901e6 100644
--- a/modules/qlopaypalcommerce/views/index.php
+++ b/modules/qlopaypalcommerce/views/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
diff --git a/modules/qlopaypalcommerce/views/js/admin/index.php b/modules/qlopaypalcommerce/views/js/admin/index.php
index 409280877..8d30901e6 100644
--- a/modules/qlopaypalcommerce/views/js/admin/index.php
+++ b/modules/qlopaypalcommerce/views/js/admin/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
diff --git a/modules/qlopaypalcommerce/views/js/admin/paypal_config.js b/modules/qlopaypalcommerce/views/js/admin/paypal_config.js
new file mode 100644
index 000000000..76e498731
--- /dev/null
+++ b/modules/qlopaypalcommerce/views/js/admin/paypal_config.js
@@ -0,0 +1,49 @@
+/**
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.md
+* It is also available through the world-wide-web at this URL:
+* https://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to support@qloapps.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to a newer
+* versions in the future. If you wish to customize this module for your needs
+* please refer to https://store.webkul.com/customisation-guidelines for more information.
+*
+* @author Webkul IN
+* @copyright Since 2010 Webkul
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
+*/
+
+$(document).ready(function() {
+ $('[name="WK_PAYPAL_COMMERCE_PAYMENT_MODE"]').on('change', function() {
+ var mode = $(this).val();
+
+ var $liveFields = $(
+ '#WK_PAYPAL_COMMERCE_LIVE_MERCHANT_ID,' +
+ '#WK_PAYPAL_COMMERCE_LIVE_EMAIL,' +
+ '#WK_PAYPAL_COMMERCE_LIVE_CLIENT_ID,' +
+ '#WK_PAYPAL_COMMERCE_LIVE_CLIENT_SECRET'
+ ).closest('.form-group');
+
+ var $sandboxFields = $(
+ '#WK_PAYPAL_COMMERCE_SANDBOX_MERCHANT_ID,' +
+ '#WK_PAYPAL_COMMERCE_SANDBOX_EMAIL,' +
+ '#WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_ID,' +
+ '#WK_PAYPAL_COMMERCE_SANDBOX_CLIENT_SECRET'
+ ).closest('.form-group');
+
+ if (mode === 'production') {
+ $liveFields.show();
+ $sandboxFields.hide();
+ } else {
+ $liveFields.hide();
+ $sandboxFields.show();
+ }
+ }).trigger('change');
+});
\ No newline at end of file
diff --git a/modules/qlopaypalcommerce/views/js/admin/wk_paypal_transaction.js b/modules/qlopaypalcommerce/views/js/admin/wk_paypal_transaction.js
index 7008c5413..b60ad2c42 100644
--- a/modules/qlopaypalcommerce/views/js/admin/wk_paypal_transaction.js
+++ b/modules/qlopaypalcommerce/views/js/admin/wk_paypal_transaction.js
@@ -1,10 +1,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -17,7 +17,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
$(document).ready(function() {
diff --git a/modules/qlopaypalcommerce/views/js/index.php b/modules/qlopaypalcommerce/views/js/index.php
index 409280877..8d30901e6 100644
--- a/modules/qlopaypalcommerce/views/js/index.php
+++ b/modules/qlopaypalcommerce/views/js/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
diff --git a/modules/qlopaypalcommerce/views/templates/admin/index.php b/modules/qlopaypalcommerce/views/templates/admin/index.php
index 409280877..8d30901e6 100644
--- a/modules/qlopaypalcommerce/views/templates/admin/index.php
+++ b/modules/qlopaypalcommerce/views/templates/admin/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
diff --git a/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/helpers/index.php b/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/helpers/index.php
index 150f23072..80123c370 100644
--- a/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/helpers/index.php
+++ b/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/helpers/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
diff --git a/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/helpers/view/index.php b/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/helpers/view/index.php
index 150f23072..80123c370 100644
--- a/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/helpers/view/index.php
+++ b/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/helpers/view/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
diff --git a/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/helpers/view/view.tpl b/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/helpers/view/view.tpl
index de150cd1b..069136b23 100644
--- a/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/helpers/view/view.tpl
+++ b/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/helpers/view/view.tpl
@@ -1,10 +1,10 @@
{**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -17,7 +17,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*}
{* If transaction is completed then admin can refund the transaction *}
-{if $transaction_data and $transaction_data.pp_payment_status == 'COMPLETED'}
+{if $transaction_data and $transaction_data.pp_payment_status == $WK_PAYPAL_COMMERCE_PAYMENT_STATUS_COMPLETED}
{* show refund form only if there is any remaing amount for refund *}
{if $remaining_refund > 0}
-
{/foreach}
{else}
diff --git a/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/index.php b/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/index.php
index 150f23072..80123c370 100644
--- a/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/index.php
+++ b/modules/qlopaypalcommerce/views/templates/admin/paypal_commerce_transaction/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
diff --git a/modules/qlopaypalcommerce/views/templates/front/index.php b/modules/qlopaypalcommerce/views/templates/front/index.php
index 150f23072..80123c370 100644
--- a/modules/qlopaypalcommerce/views/templates/front/index.php
+++ b/modules/qlopaypalcommerce/views/templates/front/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
diff --git a/modules/qlopaypalcommerce/views/templates/front/paypal_error.tpl b/modules/qlopaypalcommerce/views/templates/front/paypal_error.tpl
index f9b129f7a..90cd25682 100644
--- a/modules/qlopaypalcommerce/views/templates/front/paypal_error.tpl
+++ b/modules/qlopaypalcommerce/views/templates/front/paypal_error.tpl
@@ -1,10 +1,10 @@
{**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -17,7 +17,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*}
diff --git a/modules/qlopaypalcommerce/views/templates/hook/index.php b/modules/qlopaypalcommerce/views/templates/hook/index.php
index 409280877..8d30901e6 100644
--- a/modules/qlopaypalcommerce/views/templates/hook/index.php
+++ b/modules/qlopaypalcommerce/views/templates/hook/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
diff --git a/modules/qlopaypalcommerce/views/templates/hook/payment.tpl b/modules/qlopaypalcommerce/views/templates/hook/payment.tpl
index d1a6a8f8a..64ce65818 100644
--- a/modules/qlopaypalcommerce/views/templates/hook/payment.tpl
+++ b/modules/qlopaypalcommerce/views/templates/hook/payment.tpl
@@ -1,10 +1,10 @@
{*
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -17,53 +17,72 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*}
-
+
+ $(document).ready(function() {
+ $('#qlo_paypal_payment_option').click(function(e) {
+ e.preventDefault();
+ $('#paypal-button-container').slideToggle();
+ renderPaypalButtons();
+ });
+ });
+})(jQuery);
+
\ No newline at end of file
diff --git a/modules/qlopaypalcommerce/views/templates/hook/payment_cancel_ack.tpl b/modules/qlopaypalcommerce/views/templates/hook/payment_cancel_ack.tpl
index e5644d4ae..a8af93140 100644
--- a/modules/qlopaypalcommerce/views/templates/hook/payment_cancel_ack.tpl
+++ b/modules/qlopaypalcommerce/views/templates/hook/payment_cancel_ack.tpl
@@ -1,10 +1,10 @@
{**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -17,7 +17,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*}
diff --git a/modules/qlopaypalcommerce/views/templates/hook/payment_return.tpl b/modules/qlopaypalcommerce/views/templates/hook/payment_return.tpl
index da06c86e3..5e712124e 100644
--- a/modules/qlopaypalcommerce/views/templates/hook/payment_return.tpl
+++ b/modules/qlopaypalcommerce/views/templates/hook/payment_return.tpl
@@ -1,10 +1,10 @@
{**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -17,7 +17,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*}
{if isset($status) && $status == '1'}
diff --git a/modules/qlopaypalcommerce/views/templates/index.php b/modules/qlopaypalcommerce/views/templates/index.php
index 409280877..8d30901e6 100644
--- a/modules/qlopaypalcommerce/views/templates/index.php
+++ b/modules/qlopaypalcommerce/views/templates/index.php
@@ -2,10 +2,10 @@
/**
* NOTICE OF LICENSE
*
-* This source file is subject to the Open Software License version 3.0
+* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.md
* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
+* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to support@qloapps.com so we can send you a copy immediately.
@@ -18,7 +18,7 @@
*
* @author Webkul IN
* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
diff --git a/modules/qlostatsserviceproducts/qlostatsserviceproducts.php b/modules/qlostatsserviceproducts/qlostatsserviceproducts.php
index fd72eb7e3..b464f4569 100644
--- a/modules/qlostatsserviceproducts/qlostatsserviceproducts.php
+++ b/modules/qlostatsserviceproducts/qlostatsserviceproducts.php
@@ -57,22 +57,17 @@ class QloStatsServiceProducts extends ModuleGrid
public function hookAdminStatsModules($params)
{
$engineParamsServices = $this->getServicesParams();
- $engineParamsFacilities = $this->getFacilitiesParams();
if (Tools::getValue('export')) {
if (Tools::getValue('option') == 'services') {
$this->csvExport($engineParamsServices);
- } else if (Tools::getValue('option') == 'facilities') {
- $this->csvExport($engineParamsFacilities);
}
}
$this->context->smarty->assign(array(
'module_name' => $this->displayName,
'grid_table_services' => $this->engine($engineParamsServices),
- 'grid_table_facilities' => $this->engine($engineParamsFacilities),
'export_link_services' => Tools::safeOutput($_SERVER['REQUEST_URI']).'&export=1&option=services',
- 'export_link_facilities' => Tools::safeOutput($_SERVER['REQUEST_URI']).'&export=1&option=facilities',
));
return $this->display(__FILE__, 'services_content_block.tpl');
@@ -127,43 +122,6 @@ class QloStatsServiceProducts extends ModuleGrid
);
}
- public function getFacilitiesParams()
- {
- return array(
- 'title' => $this->l('Facilities'),
- 'columns' => array(
- array(
- 'id' => 'display_name',
- 'header' => $this->l('Name'),
- 'dataIndex' => 'display_name',
- 'align' => 'left'
- ),
- array(
- 'id' => 'totalQuantitySold',
- 'header' => $this->l('Quantity sold'),
- 'dataIndex' => 'totalQuantitySold',
- 'align' => 'left'
- ),
- array(
- 'id' => 'avgPriceSold',
- 'header' => $this->l('Average Price'),
- 'dataIndex' => 'avgPriceSold',
- 'align' => 'left'
- ),
- array(
- 'id' => 'totalPriceSold',
- 'header' => $this->l('Sales'),
- 'dataIndex' => 'totalPriceSold',
- 'align' => 'left'
- ),
- ),
- 'defaultSortColumn' => 'totalPriceSold',
- 'defaultSortDirection' => 'DESC',
- 'pagingMessage' => $this->paging_message,
- 'option' => 'facilities'
- );
- }
-
public function setOption($option)
{
$dateBetween = $this->getDate();
@@ -171,32 +129,30 @@ class QloStatsServiceProducts extends ModuleGrid
case 'services' :
$this->setQueryForServices($dateBetween);
break;
- case 'facilities' :
- $this->setQueryForFacilities($dateBetween);
- break;
}
}
public function setQueryForServices($dateBetween)
{
+ $numNightsSql = 'IFNULL(DATEDIFF(hbd.`date_to`, hbd.`date_from`), 0)';
+ $applicableDaysSql = 'CASE
+ WHEN spod.`id_htl_booking_detail` IS NULL OR spod.`id_htl_booking_detail` = 0 THEN 1
+ WHEN od.`product_price_calculation_method` IN ('.(int)Product::PRICE_CALCULATION_METHOD_ON_CHECKIN_DAY.', '.(int)Product::PRICE_CALCULATION_METHOD_ON_CHECKOUT_DAY.') THEN 1
+ WHEN od.`product_price_calculation_method` = '.(int)Product::PRICE_CALCULATION_METHOD_ON_DURING_STAY.' THEN GREATEST('.$numNightsSql.' - 1, 1)
+ WHEN od.`product_price_calculation_method` = '.(int)Product::PRICE_CALCULATION_METHOD_CHECKIN_DAY_AND_CHECKOUT_DAY.' THEN 2
+ WHEN od.`product_price_calculation_method` IN ('.(int)Product::PRICE_CALCULATION_METHOD_CHECKIN_AND_DURING_STAY.', '.(int)Product::PRICE_CALCULATION_METHOD_CHECKOUT_AND_DURING_STAY.') THEN GREATEST('.$numNightsSql.', 1)
+ WHEN od.`product_price_calculation_method` = '.(int)Product::PRICE_CALCULATION_METHOD_CHECKIN_AND_CHECKOUT_AND_DURING_STAY.' THEN GREATEST('.$numNightsSql.' + 1, 1)
+ ELSE GREATEST('.$numNightsSql.', 1)
+ END';
+
$this->query = '(SELECT od.`product_name` as `display_name`, p.`active`,
od.`product_auto_add` as auto_add_to_cart,
od.`product_price_addition_type` as price_addition_type,
ROUND(IFNULL(SUM(spod.`total_price_tax_excl` / o.`conversion_rate`), 0), 2) / SUM(
- IF(od.`product_price_calculation_method` = '.(int)Product::PRICE_CALCULATION_METHOD_PER_DAY.',
- (IF(spod.`id_htl_booking_detail`,
- DATEDIFF(hbd.`date_to`, hbd.`date_from`),
- 1)) * spod.`quantity`,
- spod.`quantity`
- )
+ ('.$applicableDaysSql.') * spod.`quantity`
) AS avgPriceSold,
IFNULL(SUM(
- IF(od.`product_price_calculation_method` = '.(int)Product::PRICE_CALCULATION_METHOD_PER_DAY.',
- (IF(spod.`id_htl_booking_detail`,
- DATEDIFF(hbd.`date_to`, hbd.`date_from`),
- 1)) * spod.`quantity`,
- spod.`quantity`
- )
+ ('.$applicableDaysSql.') * spod.`quantity`
), 0) AS totalQuantitySold,
ROUND(IFNULL(SUM(spod.`total_price_tax_excl` / o.`conversion_rate`), 0), 2) AS totalPriceSold
FROM '._DB_PREFIX_.'service_product_order_detail spod
@@ -262,80 +218,6 @@ class QloStatsServiceProducts extends ModuleGrid
$this->option = 'services';
}
- public function setQueryForFacilities($dateBetween)
- {
- $this->query = '(SELECT bd.`name` as `display_name`,
- ROUND(IFNULL(SUM(bd.`total_price_tax_excl` / o.`conversion_rate`), 0), 2) / SUM(
- IF(bd.`price_calc_method` = '.(int)HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY.',
- DATEDIFF(hbd.`date_to`, hbd.`date_from`) * 1,
- 1
- )
- ) as avgPriceSold,
- IFNULL(SUM(
- IF(bd.`price_calc_method` = '.(int)HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY.',
- DATEDIFF(hbd.`date_to`, hbd.`date_from`) * 1,
- 1
- )
- ), 0) AS totalQuantitySold,
- ROUND(IFNULL(SUM(bd.`total_price_tax_excl` / o.`conversion_rate`), 0), 2) AS totalPriceSold
- FROM '._DB_PREFIX_.'htl_booking_demands bd
- INNER JOIN `'._DB_PREFIX_.'htl_booking_detail` hbd ON (bd.`id_htl_booking` = hbd.`id`)
- INNER JOIN '._DB_PREFIX_.'orders o ON (hbd.id_order = o.id_order)
- WHERE o.valid = 1 AND o.invoice_date BETWEEN '.$dateBetween.'
- AND (
- EXISTS (
- SELECT 1
- FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
- WHERE hbd.`id_order` = o.`id_order`' . HotelBranchInformation::addHotelRestriction(false).'
- ) OR EXISTS (
- SELECT 1
- FROM `'._DB_PREFIX_.'service_product_order_detail` spod
- WHERE spod.`id_order` = o.`id_order`' . HotelBranchInformation::addHotelRestriction(false, 'spod').'
- ) OR EXISTS (
- SELECT 1
- FROM `'._DB_PREFIX_.'service_product_order_detail` spod
- WHERE spod.`id_order` = o.`id_order` AND spod.`id_hotel` = 0 AND spod.`id_htl_booking_detail` = 0
- )
- )
- GROUP BY bd.`name`)
- UNION
- (SELECT IFNULL(gdaol.`name`, gdl.`name`) as `display_name`,
- 0 as avgPriceSold,
- 0 AS totalQuantitySold,
- 0 AS totalPriceSold
- FROM '._DB_PREFIX_.'htl_room_type_global_demand gd
- LEFT JOIN '._DB_PREFIX_.'htl_room_type_global_demand_lang gdl
- ON (gd.id_global_demand = gdl.id_global_demand AND gdl.id_lang = '.(int)$this->getLang().')
- LEFT JOIN `'._DB_PREFIX_.'htl_room_type_global_demand_advance_option` gdao
- ON (gd.id_global_demand = gdao.id_global_demand)
- LEFT JOIN `'._DB_PREFIX_.'htl_room_type_global_demand_advance_option_lang` gdaol
- ON (gdao.id_option = gdaol.id_option AND gdaol.id_lang = '.(int)$this->getLang().')
- WHERE 1
- GROUP BY gdaol.`name`, gdl.`name`
- HAVING `display_name` NOT IN (SELECT bd.`name` FROM '._DB_PREFIX_.'htl_booking_demands bd
- INNER JOIN `'._DB_PREFIX_.'htl_booking_detail` hbd ON (bd.`id_htl_booking` = hbd.`id`)
- INNER JOIN '._DB_PREFIX_.'orders o ON (hbd.id_order = o.id_order)
- WHERE o.valid = 1 AND o.invoice_date BETWEEN '.$dateBetween.'
- AND (
- EXISTS (
- SELECT 1
- FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
- WHERE hbd.`id_order` = o.`id_order`' . HotelBranchInformation::addHotelRestriction(false).'
- ) OR EXISTS (
- SELECT 1
- FROM `'._DB_PREFIX_.'service_product_order_detail` spod
- WHERE spod.`id_order` = o.`id_order`' . HotelBranchInformation::addHotelRestriction(false, 'spod').'
- ) OR EXISTS (
- SELECT 1
- FROM `'._DB_PREFIX_.'service_product_order_detail` spod
- WHERE spod.`id_order` = o.`id_order` AND spod.`id_hotel` = 0 AND spod.`id_htl_booking_detail` = 0
- )
- )
- ))';
-
- $this->option = 'facilities';
- }
-
public function getData()
{
$currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
diff --git a/modules/qlostatsserviceproducts/views/templates/hook/services_content_block.tpl b/modules/qlostatsserviceproducts/views/templates/hook/services_content_block.tpl
index 1f0da9e15..4047e315a 100644
--- a/modules/qlostatsserviceproducts/views/templates/hook/services_content_block.tpl
+++ b/modules/qlostatsserviceproducts/views/templates/hook/services_content_block.tpl
@@ -27,13 +27,4 @@
{l s='CSV Export' mod='qlostatsserviceproducts'}
-
diff --git a/pdf/guest-registration-form.tpl b/pdf/guest-registration-form.tpl
new file mode 100644
index 000000000..7a193936a
--- /dev/null
+++ b/pdf/guest-registration-form.tpl
@@ -0,0 +1,631 @@
+{*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License version 3.0
+* that is bundled with this package in the file LICENSE.txt
+* It is also available through the world-wide-web at this URL:
+* https://opensource.org/licenses/AFL-3.0
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to a newer
+* versions in the future. If you wish to customize this module for your
+* needs please refer to CustomizationPolicy.txt file inside our module for more information.
+*
+* @author Webkul IN
+* @copyright Since 2010 Webkul
+* @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+*}
+
+{$style_tab}
+
+
- {l s='You can\'t book rooms after %s.' sprintf=[{dateFormat date=$max_order_date full=0}]}
+ {l s='You can\'t book stays after %s.' sprintf=[{dateFormat date=$max_order_date full=0}]}
{/if} *}
diff --git a/themes/hotel-reservation-theme/_partials/cart_booking_demands.tpl b/themes/hotel-reservation-theme/_partials/cart_booking_demands.tpl
deleted file mode 100644
index d92fa02db..000000000
--- a/themes/hotel-reservation-theme/_partials/cart_booking_demands.tpl
+++ /dev/null
@@ -1,192 +0,0 @@
-{**
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License version 3.0
-* that is bundled with this package in the file LICENSE.md
-* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to support@qloapps.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade this module to a newer
-* versions in the future. If you wish to customize this module for your needs
-* please refer to https://store.webkul.com/customisation-guidelines for more information.
-*
-* @author Webkul IN
-* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
-*}
-
-{block name='cart_booking_demands'}
-
- {if (isset($selectedRoomDemands) && $selectedRoomDemands) || (isset($roomTypeServiceProducts) && $roomTypeServiceProducts)}
- {block name='cart_booking_demands_tabs'}
-
- {/block}
- {/if}
-
-{/block}
diff --git a/themes/hotel-reservation-theme/_partials/cart_booking_services.tpl b/themes/hotel-reservation-theme/_partials/cart_booking_services.tpl
new file mode 100644
index 000000000..f9f437596
--- /dev/null
+++ b/themes/hotel-reservation-theme/_partials/cart_booking_services.tpl
@@ -0,0 +1,117 @@
+{**
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License version 3.0
+* that is bundled with this package in the file LICENSE.md
+* It is also available through the world-wide-web at this URL:
+* https://opensource.org/license/osl-3-0-php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to support@qloapps.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to a newer
+* versions in the future. If you wish to customize this module for your needs
+* please refer to https://store.webkul.com/customisation-guidelines for more information.
+*
+* @author Webkul IN
+* @copyright Since 2010 Webkul
+* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+*}
+
+{block name='cart_booking_services'}
+
+ {if isset($roomTypeServiceProducts) && $roomTypeServiceProducts}
+ {block name='cart_booking_services_tabs'}
+
{l s='No extra services added for this %s.' sprintf=$data_v.selling_object_name|escape:'html':'UTF-8'}
{/if}
@@ -1057,7 +1074,7 @@
{$product_option.name}{if isset($product_option.option_name) && $product_option.option_name} : {$product_option.option_name}{/if}
- {if $product_option.is_cancelled}{l s='Cancelled'}{else if $product_option.is_refunded}{l s='Refunded'}{else if isset($product_option.refund_denied) && $product_option.refund_denied}{l s='Refund denied'} {/if}
+ {if $product_option.is_cancelled}{l s='Cancelled'}{else if $product_option.is_refunded}{l s='Refunded'}{else if isset($product_option.refund_denied) && $product_option.refund_denied}{l s='Refund denied'} {include file='_partials/ui-tooltip.tpl' tooltip_content={l s='Refund for this product is denied. Please contact admin for more detail.'}}{/if}
{if $product_option.allow_multiple_quantity}
@@ -1153,7 +1170,7 @@
{addJsDefL name=pending_state_msg}{l s='Pending...' js=1}{/addJsDefL}
{addJsDefL name=mail_sending_err}{l s='Some error occurred while sending mail to the customer' js=1}{/addJsDefL}
{addJsDefL name=refund_request_sending_error}{l s='Some error occurred while processing request for booking cancellation.' js=1}{/addJsDefL}
- {addJsDefL name=no_bookings_selected}{l s='Please select at least one room to proceed for cancellation.' js=1}{/addJsDefL}
+ {addJsDefL name=no_bookings_selected}{l s='Please select at least one room or service to proceed for cancellation.' js=1}{/addJsDefL}
{addJsDefL name=refund_request_success_txt}{l s='Request for booking cancellation is successffully created.' js=1}{/addJsDefL}
{addJsDefL name=order_message_choose_txt}{l s='-- Choose --' js=1}{/addJsDefL}
{addJsDefL name=order_message_success_txt}{l s='Order message sent successfully.' js=1}{/addJsDefL}
diff --git a/themes/hotel-reservation-theme/order-opc-new-account-advanced.tpl b/themes/hotel-reservation-theme/order-opc-new-account-advanced.tpl
index 2b2c145c7..285d8bd20 100644
--- a/themes/hotel-reservation-theme/order-opc-new-account-advanced.tpl
+++ b/themes/hotel-reservation-theme/order-opc-new-account-advanced.tpl
@@ -91,6 +91,17 @@
{l s='Last name'} *
diff --git a/themes/hotel-reservation-theme/shopping-cart.tpl b/themes/hotel-reservation-theme/shopping-cart.tpl
index 06b09b5bb..dd2fbfd94 100644
--- a/themes/hotel-reservation-theme/shopping-cart.tpl
+++ b/themes/hotel-reservation-theme/shopping-cart.tpl
@@ -87,7 +87,7 @@
{/block}
{/if}
-{* Fancybox for extra demands*}
+{* Fancybox for extra services *}
{block name='shopping_cart_extra_services'}
diff --git a/tools/htmlpurifier/HTMLPurifier.includes.php b/tools/htmlpurifier/HTMLPurifier.includes.php
index 4c713a33a..1f99a4aa2 100644
--- a/tools/htmlpurifier/HTMLPurifier.includes.php
+++ b/tools/htmlpurifier/HTMLPurifier.includes.php
@@ -7,7 +7,7 @@
* primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
* FILE, changes will be overwritten the next time the script is run.
*
- * @version 4.18.0
+ * @version 4.19.0
*
* @warning
* You must *not* include any other HTML Purifier files before this file,
diff --git a/tools/htmlpurifier/HTMLPurifier.php b/tools/htmlpurifier/HTMLPurifier.php
index e3bca8a22..31b5a0f79 100644
--- a/tools/htmlpurifier/HTMLPurifier.php
+++ b/tools/htmlpurifier/HTMLPurifier.php
@@ -19,7 +19,7 @@
*/
/*
- HTML Purifier 4.18.0 - Standards Compliant HTML Filtering
+ HTML Purifier 4.19.0 - Standards Compliant HTML Filtering
Copyright (C) 2006-2008 Edward Z. Yang
This library is free software; you can redistribute it and/or
@@ -58,12 +58,12 @@ class HTMLPurifier
* Version of HTML Purifier.
* @type string
*/
- public $version = '4.18.0';
+ public $version = '4.19.0';
/**
* Constant with version of HTML Purifier.
*/
- const VERSION = '4.18.0';
+ const VERSION = '4.19.0';
/**
* Global configuration object.
diff --git a/tools/htmlpurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php b/tools/htmlpurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
index f1ff11636..799166bb9 100644
--- a/tools/htmlpurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
+++ b/tools/htmlpurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
@@ -195,7 +195,7 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
// transforms don't pose a security risk (as \\ and \"
// might--these escapes are not supported by most browsers).
// We could try to be clever and use single-quote wrapping
- // when there is a double quote present, but I have choosen
+ // when there is a double quote present, but I have chosen
// not to implement that. (NOTE: you can reduce the amount
// of escapes by one depending on what quoting style you use)
// $font = str_replace('\\', '\\5C ', $font);
diff --git a/tools/htmlpurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php b/tools/htmlpurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php
index 63fa04c15..3decf0c45 100644
--- a/tools/htmlpurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php
+++ b/tools/htmlpurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php
@@ -25,12 +25,7 @@ class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef
'rev' => 'AllowedRev'
);
if (!isset($configLookup[$name])) {
- trigger_error(
- 'Unrecognized attribute name for link ' .
- 'relationship.',
- E_USER_ERROR
- );
- return;
+ throw new Exception('Unrecognized attribute name for link relationship.');
}
$this->name = $configLookup[$name];
}
diff --git a/tools/htmlpurifier/HTMLPurifier/AttrDef/URI/IPv6.php b/tools/htmlpurifier/HTMLPurifier/AttrDef/URI/IPv6.php
index f243793ee..dc4ef62ee 100644
--- a/tools/htmlpurifier/HTMLPurifier/AttrDef/URI/IPv6.php
+++ b/tools/htmlpurifier/HTMLPurifier/AttrDef/URI/IPv6.php
@@ -37,7 +37,7 @@ class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4
}
}
- // IPv4-compatiblity check
+ // IPv4-compatibility check
if (preg_match('#(?<=:' . ')' . $this->ip4 . '$#s', $aIP, $find)) {
$aIP = substr($aIP, 0, 0 - strlen($find[0]));
$ip = explode('.', $find[0]);
diff --git a/tools/htmlpurifier/HTMLPurifier/AttrTransform/BdoDir.php b/tools/htmlpurifier/HTMLPurifier/AttrTransform/BdoDir.php
index d66c04a5b..d769c6fd2 100644
--- a/tools/htmlpurifier/HTMLPurifier/AttrTransform/BdoDir.php
+++ b/tools/htmlpurifier/HTMLPurifier/AttrTransform/BdoDir.php
@@ -3,7 +3,7 @@
// this MUST be placed in post, as it assumes that any value in dir is valid
/**
- * Post-trasnform that ensures that bdo tags have the dir attribute set.
+ * Post-transform that ensures that bdo tags have the dir attribute set.
*/
class HTMLPurifier_AttrTransform_BdoDir extends HTMLPurifier_AttrTransform
{
diff --git a/tools/htmlpurifier/HTMLPurifier/AttrTypes.php b/tools/htmlpurifier/HTMLPurifier/AttrTypes.php
index e4429e86d..62575ca65 100644
--- a/tools/htmlpurifier/HTMLPurifier/AttrTypes.php
+++ b/tools/htmlpurifier/HTMLPurifier/AttrTypes.php
@@ -77,7 +77,7 @@ class HTMLPurifier_AttrTypes
}
if (!isset($this->info[$type])) {
- trigger_error('Cannot retrieve undefined attribute type ' . $type, E_USER_ERROR);
+ throw new Exception('Cannot retrieve undefined attribute type ' . $type);
return;
}
return $this->info[$type]->make($string);
diff --git a/tools/htmlpurifier/HTMLPurifier/AttrValidator.php b/tools/htmlpurifier/HTMLPurifier/AttrValidator.php
index f97dc93ed..350330bb5 100644
--- a/tools/htmlpurifier/HTMLPurifier/AttrValidator.php
+++ b/tools/htmlpurifier/HTMLPurifier/AttrValidator.php
@@ -135,7 +135,7 @@ class HTMLPurifier_AttrValidator
// we'd also want slightly more complicated substitution
// involving an array as the return value,
// although we're not sure how colliding attributes would
- // resolve (certain ones would be completely overriden,
+ // resolve (certain ones would be completely overridden,
// others would prepend themselves).
}
diff --git a/tools/htmlpurifier/HTMLPurifier/Bootstrap.php b/tools/htmlpurifier/HTMLPurifier/Bootstrap.php
index bd8f9984f..8805eccff 100644
--- a/tools/htmlpurifier/HTMLPurifier/Bootstrap.php
+++ b/tools/htmlpurifier/HTMLPurifier/Bootstrap.php
@@ -5,7 +5,7 @@ if (!defined('HTMLPURIFIER_PREFIX')) {
define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__) . '/..'));
}
-// accomodations for versions earlier than 5.0.2
+// accommodations for versions earlier than 5.0.2
// borrowed from PHP_Compat, LGPL licensed, by Aidan Lister
if (!defined('PHP_EOL')) {
switch (strtoupper(substr(PHP_OS, 0, 3))) {
diff --git a/tools/htmlpurifier/HTMLPurifier/CSSDefinition.php b/tools/htmlpurifier/HTMLPurifier/CSSDefinition.php
index 3732c076a..923d6f3d0 100644
--- a/tools/htmlpurifier/HTMLPurifier/CSSDefinition.php
+++ b/tools/htmlpurifier/HTMLPurifier/CSSDefinition.php
@@ -26,6 +26,11 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
false
);
+ $this->info['direction'] = new HTMLPurifier_AttrDef_Enum(
+ ['ltr', 'rtl'],
+ false
+ );
+
$border_style =
$this->info['border-bottom-style'] =
$this->info['border-right-style'] =
diff --git a/tools/htmlpurifier/HTMLPurifier/Config.php b/tools/htmlpurifier/HTMLPurifier/Config.php
index e6566e802..256408e2f 100644
--- a/tools/htmlpurifier/HTMLPurifier/Config.php
+++ b/tools/htmlpurifier/HTMLPurifier/Config.php
@@ -21,7 +21,7 @@ class HTMLPurifier_Config
* HTML Purifier's version
* @type string
*/
- public $version = '4.18.0';
+ public $version = '4.19.0';
/**
* Whether or not to automatically finalize
@@ -898,7 +898,11 @@ class HTMLPurifier_Config
break;
}
}
- trigger_error($msg . $extra, $no);
+ if ($no == E_USER_ERROR) {
+ throw new Exception($msg . $extra);
+ } else {
+ trigger_error($msg . $extra, $no);
+ }
}
/**
diff --git a/tools/htmlpurifier/HTMLPurifier/ConfigSchema.php b/tools/htmlpurifier/HTMLPurifier/ConfigSchema.php
index c3fe8cd4a..42f660473 100644
--- a/tools/htmlpurifier/HTMLPurifier/ConfigSchema.php
+++ b/tools/htmlpurifier/HTMLPurifier/ConfigSchema.php
@@ -72,7 +72,7 @@ class HTMLPurifier_ConfigSchema
$r = unserialize($contents);
if (!$r) {
$hash = sha1($contents);
- trigger_error("Unserialization of configuration schema failed, sha1 of file was $hash", E_USER_ERROR);
+ throw new Exception("Unserialization of configuration schema failed, sha1 of file was $hash");
}
return $r;
}
diff --git a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php
index 127a39a67..4902a56d9 100644
--- a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php
+++ b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php
@@ -66,7 +66,7 @@ class HTMLPurifier_ConfigSchema_Interchange_Directive
public $version;
/**
- * ID of directive that supercedes this old directive.
+ * ID of directive that supersedes this old directive.
* Null if not deprecated.
* @type HTMLPurifier_ConfigSchema_Interchange_Id
*/
diff --git a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema.ser b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema.ser
index 3cd756bee..34ea68371 100644
--- a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema.ser
+++ b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema.ser
@@ -1 +1 @@
-O:25:"HTMLPurifier_ConfigSchema":3:{s:8:"defaults";a:128:{s:19:"Attr.AllowedClasses";N;s:24:"Attr.AllowedFrameTargets";a:0:{}s:15:"Attr.AllowedRel";a:0:{}s:15:"Attr.AllowedRev";a:0:{}s:18:"Attr.ClassUseCDATA";N;s:20:"Attr.DefaultImageAlt";N;s:24:"Attr.DefaultInvalidImage";s:0:"";s:27:"Attr.DefaultInvalidImageAlt";s:13:"Invalid image";s:19:"Attr.DefaultTextDir";s:3:"ltr";s:13:"Attr.EnableID";b:0;s:21:"Attr.ForbiddenClasses";a:0:{}s:13:"Attr.ID.HTML5";N;s:16:"Attr.IDBlacklist";a:0:{}s:22:"Attr.IDBlacklistRegexp";N;s:13:"Attr.IDPrefix";s:0:"";s:18:"Attr.IDPrefixLocal";s:0:"";s:24:"AutoFormat.AutoParagraph";b:0;s:17:"AutoFormat.Custom";a:0:{}s:25:"AutoFormat.DisplayLinkURI";b:0;s:18:"AutoFormat.Linkify";b:0;s:33:"AutoFormat.PurifierLinkify.DocURL";s:3:"#%s";s:26:"AutoFormat.PurifierLinkify";b:0;s:32:"AutoFormat.RemoveEmpty.Predicate";a:4:{s:8:"colgroup";a:0:{}s:2:"th";a:0:{}s:2:"td";a:0:{}s:6:"iframe";a:1:{i:0;s:3:"src";}}s:44:"AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions";a:2:{s:2:"td";b:1;s:2:"th";b:1;}s:33:"AutoFormat.RemoveEmpty.RemoveNbsp";b:0;s:22:"AutoFormat.RemoveEmpty";b:0;s:39:"AutoFormat.RemoveSpansWithoutAttributes";b:0;s:19:"CSS.AllowDuplicates";b:0;s:18:"CSS.AllowImportant";b:0;s:15:"CSS.AllowTricky";b:0;s:16:"CSS.AllowedFonts";N;s:21:"CSS.AllowedProperties";N;s:17:"CSS.DefinitionRev";i:1;s:23:"CSS.ForbiddenProperties";a:0:{}s:16:"CSS.MaxImgLength";s:6:"1200px";s:15:"CSS.Proprietary";b:0;s:11:"CSS.Trusted";b:0;s:20:"Cache.DefinitionImpl";s:10:"Serializer";s:20:"Cache.SerializerPath";N;s:27:"Cache.SerializerPermissions";i:493;s:22:"Core.AggressivelyFixLt";b:1;s:29:"Core.AggressivelyRemoveScript";b:1;s:28:"Core.AllowHostnameUnderscore";b:0;s:23:"Core.AllowParseManyTags";b:0;s:18:"Core.CollectErrors";b:0;s:18:"Core.ColorKeywords";a:148:{s:9:"aliceblue";s:7:"#F0F8FF";s:12:"antiquewhite";s:7:"#FAEBD7";s:4:"aqua";s:7:"#00FFFF";s:10:"aquamarine";s:7:"#7FFFD4";s:5:"azure";s:7:"#F0FFFF";s:5:"beige";s:7:"#F5F5DC";s:6:"bisque";s:7:"#FFE4C4";s:5:"black";s:7:"#000000";s:14:"blanchedalmond";s:7:"#FFEBCD";s:4:"blue";s:7:"#0000FF";s:10:"blueviolet";s:7:"#8A2BE2";s:5:"brown";s:7:"#A52A2A";s:9:"burlywood";s:7:"#DEB887";s:9:"cadetblue";s:7:"#5F9EA0";s:10:"chartreuse";s:7:"#7FFF00";s:9:"chocolate";s:7:"#D2691E";s:5:"coral";s:7:"#FF7F50";s:14:"cornflowerblue";s:7:"#6495ED";s:8:"cornsilk";s:7:"#FFF8DC";s:7:"crimson";s:7:"#DC143C";s:4:"cyan";s:7:"#00FFFF";s:8:"darkblue";s:7:"#00008B";s:8:"darkcyan";s:7:"#008B8B";s:13:"darkgoldenrod";s:7:"#B8860B";s:8:"darkgray";s:7:"#A9A9A9";s:8:"darkgrey";s:7:"#A9A9A9";s:9:"darkgreen";s:7:"#006400";s:9:"darkkhaki";s:7:"#BDB76B";s:11:"darkmagenta";s:7:"#8B008B";s:14:"darkolivegreen";s:7:"#556B2F";s:10:"darkorange";s:7:"#FF8C00";s:10:"darkorchid";s:7:"#9932CC";s:7:"darkred";s:7:"#8B0000";s:10:"darksalmon";s:7:"#E9967A";s:12:"darkseagreen";s:7:"#8FBC8F";s:13:"darkslateblue";s:7:"#483D8B";s:13:"darkslategray";s:7:"#2F4F4F";s:13:"darkslategrey";s:7:"#2F4F4F";s:13:"darkturquoise";s:7:"#00CED1";s:10:"darkviolet";s:7:"#9400D3";s:8:"deeppink";s:7:"#FF1493";s:11:"deepskyblue";s:7:"#00BFFF";s:7:"dimgray";s:7:"#696969";s:7:"dimgrey";s:7:"#696969";s:10:"dodgerblue";s:7:"#1E90FF";s:9:"firebrick";s:7:"#B22222";s:11:"floralwhite";s:7:"#FFFAF0";s:11:"forestgreen";s:7:"#228B22";s:7:"fuchsia";s:7:"#FF00FF";s:9:"gainsboro";s:7:"#DCDCDC";s:10:"ghostwhite";s:7:"#F8F8FF";s:4:"gold";s:7:"#FFD700";s:9:"goldenrod";s:7:"#DAA520";s:4:"gray";s:7:"#808080";s:4:"grey";s:7:"#808080";s:5:"green";s:7:"#008000";s:11:"greenyellow";s:7:"#ADFF2F";s:8:"honeydew";s:7:"#F0FFF0";s:7:"hotpink";s:7:"#FF69B4";s:9:"indianred";s:7:"#CD5C5C";s:6:"indigo";s:7:"#4B0082";s:5:"ivory";s:7:"#FFFFF0";s:5:"khaki";s:7:"#F0E68C";s:8:"lavender";s:7:"#E6E6FA";s:13:"lavenderblush";s:7:"#FFF0F5";s:9:"lawngreen";s:7:"#7CFC00";s:12:"lemonchiffon";s:7:"#FFFACD";s:9:"lightblue";s:7:"#ADD8E6";s:10:"lightcoral";s:7:"#F08080";s:9:"lightcyan";s:7:"#E0FFFF";s:20:"lightgoldenrodyellow";s:7:"#FAFAD2";s:9:"lightgray";s:7:"#D3D3D3";s:9:"lightgrey";s:7:"#D3D3D3";s:10:"lightgreen";s:7:"#90EE90";s:9:"lightpink";s:7:"#FFB6C1";s:11:"lightsalmon";s:7:"#FFA07A";s:13:"lightseagreen";s:7:"#20B2AA";s:12:"lightskyblue";s:7:"#87CEFA";s:14:"lightslategray";s:7:"#778899";s:14:"lightslategrey";s:7:"#778899";s:14:"lightsteelblue";s:7:"#B0C4DE";s:11:"lightyellow";s:7:"#FFFFE0";s:4:"lime";s:7:"#00FF00";s:9:"limegreen";s:7:"#32CD32";s:5:"linen";s:7:"#FAF0E6";s:7:"magenta";s:7:"#FF00FF";s:6:"maroon";s:7:"#800000";s:16:"mediumaquamarine";s:7:"#66CDAA";s:10:"mediumblue";s:7:"#0000CD";s:12:"mediumorchid";s:7:"#BA55D3";s:12:"mediumpurple";s:7:"#9370DB";s:14:"mediumseagreen";s:7:"#3CB371";s:15:"mediumslateblue";s:7:"#7B68EE";s:17:"mediumspringgreen";s:7:"#00FA9A";s:15:"mediumturquoise";s:7:"#48D1CC";s:15:"mediumvioletred";s:7:"#C71585";s:12:"midnightblue";s:7:"#191970";s:9:"mintcream";s:7:"#F5FFFA";s:9:"mistyrose";s:7:"#FFE4E1";s:8:"moccasin";s:7:"#FFE4B5";s:11:"navajowhite";s:7:"#FFDEAD";s:4:"navy";s:7:"#000080";s:7:"oldlace";s:7:"#FDF5E6";s:5:"olive";s:7:"#808000";s:9:"olivedrab";s:7:"#6B8E23";s:6:"orange";s:7:"#FFA500";s:9:"orangered";s:7:"#FF4500";s:6:"orchid";s:7:"#DA70D6";s:13:"palegoldenrod";s:7:"#EEE8AA";s:9:"palegreen";s:7:"#98FB98";s:13:"paleturquoise";s:7:"#AFEEEE";s:13:"palevioletred";s:7:"#DB7093";s:10:"papayawhip";s:7:"#FFEFD5";s:9:"peachpuff";s:7:"#FFDAB9";s:4:"peru";s:7:"#CD853F";s:4:"pink";s:7:"#FFC0CB";s:4:"plum";s:7:"#DDA0DD";s:10:"powderblue";s:7:"#B0E0E6";s:6:"purple";s:7:"#800080";s:13:"rebeccapurple";s:7:"#663399";s:3:"red";s:7:"#FF0000";s:9:"rosybrown";s:7:"#BC8F8F";s:9:"royalblue";s:7:"#4169E1";s:11:"saddlebrown";s:7:"#8B4513";s:6:"salmon";s:7:"#FA8072";s:10:"sandybrown";s:7:"#F4A460";s:8:"seagreen";s:7:"#2E8B57";s:8:"seashell";s:7:"#FFF5EE";s:6:"sienna";s:7:"#A0522D";s:6:"silver";s:7:"#C0C0C0";s:7:"skyblue";s:7:"#87CEEB";s:9:"slateblue";s:7:"#6A5ACD";s:9:"slategray";s:7:"#708090";s:9:"slategrey";s:7:"#708090";s:4:"snow";s:7:"#FFFAFA";s:11:"springgreen";s:7:"#00FF7F";s:9:"steelblue";s:7:"#4682B4";s:3:"tan";s:7:"#D2B48C";s:4:"teal";s:7:"#008080";s:7:"thistle";s:7:"#D8BFD8";s:6:"tomato";s:7:"#FF6347";s:9:"turquoise";s:7:"#40E0D0";s:6:"violet";s:7:"#EE82EE";s:5:"wheat";s:7:"#F5DEB3";s:5:"white";s:7:"#FFFFFF";s:10:"whitesmoke";s:7:"#F5F5F5";s:6:"yellow";s:7:"#FFFF00";s:11:"yellowgreen";s:7:"#9ACD32";}s:30:"Core.ConvertDocumentToFragment";b:1;s:36:"Core.DirectLexLineNumberSyncInterval";i:0;s:20:"Core.DisableExcludes";b:0;s:15:"Core.EnableIDNA";b:0;s:13:"Core.Encoding";s:5:"utf-8";s:26:"Core.EscapeInvalidChildren";b:0;s:22:"Core.EscapeInvalidTags";b:0;s:29:"Core.EscapeNonASCIICharacters";b:0;s:19:"Core.HiddenElements";a:2:{s:6:"script";b:1;s:5:"style";b:1;}s:13:"Core.Language";s:2:"en";s:24:"Core.LegacyEntityDecoder";b:0;s:14:"Core.LexerImpl";N;s:24:"Core.MaintainLineNumbers";N;s:22:"Core.NormalizeNewlines";b:1;s:17:"Core.RemoveBlanks";b:0;s:21:"Core.RemoveInvalidImg";b:1;s:33:"Core.RemoveProcessingInstructions";b:0;s:25:"Core.RemoveScriptContents";N;s:13:"Filter.Custom";a:0:{}s:34:"Filter.ExtractStyleBlocks.Escaping";b:1;s:31:"Filter.ExtractStyleBlocks.Scope";N;s:34:"Filter.ExtractStyleBlocks.TidyImpl";N;s:25:"Filter.ExtractStyleBlocks";b:0;s:14:"Filter.YouTube";b:0;s:12:"HTML.Allowed";N;s:22:"HTML.AllowedAttributes";N;s:20:"HTML.AllowedComments";a:0:{}s:26:"HTML.AllowedCommentsRegexp";N;s:20:"HTML.AllowedElements";N;s:19:"HTML.AllowedModules";N;s:23:"HTML.Attr.Name.UseCDATA";b:0;s:17:"HTML.BlockWrapper";s:1:"p";s:16:"HTML.CoreModules";a:7:{s:9:"Structure";b:1;s:4:"Text";b:1;s:9:"Hypertext";b:1;s:4:"List";b:1;s:22:"NonXMLCommonAttributes";b:1;s:19:"XMLCommonAttributes";b:1;s:16:"CommonAttributes";b:1;}s:18:"HTML.CustomDoctype";N;s:17:"HTML.DefinitionID";N;s:18:"HTML.DefinitionRev";i:1;s:12:"HTML.Doctype";N;s:25:"HTML.FlashAllowFullScreen";b:0;s:24:"HTML.ForbiddenAttributes";a:0:{}s:22:"HTML.ForbiddenElements";a:0:{}s:10:"HTML.Forms";b:0;s:17:"HTML.MaxImgLength";i:1200;s:13:"HTML.Nofollow";b:0;s:11:"HTML.Parent";s:3:"div";s:16:"HTML.Proprietary";b:0;s:14:"HTML.SafeEmbed";b:0;s:15:"HTML.SafeIframe";b:0;s:15:"HTML.SafeObject";b:0;s:18:"HTML.SafeScripting";a:0:{}s:11:"HTML.Strict";b:0;s:16:"HTML.TargetBlank";b:0;s:19:"HTML.TargetNoopener";b:1;s:21:"HTML.TargetNoreferrer";b:1;s:12:"HTML.TidyAdd";a:0:{}s:14:"HTML.TidyLevel";s:6:"medium";s:15:"HTML.TidyRemove";a:0:{}s:12:"HTML.Trusted";b:0;s:10:"HTML.XHTML";b:1;s:28:"Output.CommentScriptContents";b:1;s:19:"Output.FixInnerHTML";b:1;s:18:"Output.FlashCompat";b:0;s:14:"Output.Newline";N;s:15:"Output.SortAttr";b:0;s:17:"Output.TidyFormat";b:0;s:17:"Test.ForceNoIconv";b:0;s:18:"URI.AllowedSchemes";a:7:{s:4:"http";b:1;s:5:"https";b:1;s:6:"mailto";b:1;s:3:"ftp";b:1;s:4:"nntp";b:1;s:4:"news";b:1;s:3:"tel";b:1;}s:8:"URI.Base";N;s:17:"URI.DefaultScheme";s:4:"http";s:16:"URI.DefinitionID";N;s:17:"URI.DefinitionRev";i:1;s:11:"URI.Disable";b:0;s:19:"URI.DisableExternal";b:0;s:28:"URI.DisableExternalResources";b:0;s:20:"URI.DisableResources";b:0;s:8:"URI.Host";N;s:17:"URI.HostBlacklist";a:0:{}s:16:"URI.MakeAbsolute";b:0;s:9:"URI.Munge";N;s:18:"URI.MungeResources";b:0;s:18:"URI.MungeSecretKey";N;s:26:"URI.OverrideAllowedSchemes";b:1;s:20:"URI.SafeIframeRegexp";N;}s:12:"defaultPlist";O:25:"HTMLPurifier_PropertyList":3:{s:7:" * data";a:128:{s:19:"Attr.AllowedClasses";N;s:24:"Attr.AllowedFrameTargets";a:0:{}s:15:"Attr.AllowedRel";a:0:{}s:15:"Attr.AllowedRev";a:0:{}s:18:"Attr.ClassUseCDATA";N;s:20:"Attr.DefaultImageAlt";N;s:24:"Attr.DefaultInvalidImage";s:0:"";s:27:"Attr.DefaultInvalidImageAlt";s:13:"Invalid image";s:19:"Attr.DefaultTextDir";s:3:"ltr";s:13:"Attr.EnableID";b:0;s:21:"Attr.ForbiddenClasses";a:0:{}s:13:"Attr.ID.HTML5";N;s:16:"Attr.IDBlacklist";a:0:{}s:22:"Attr.IDBlacklistRegexp";N;s:13:"Attr.IDPrefix";s:0:"";s:18:"Attr.IDPrefixLocal";s:0:"";s:24:"AutoFormat.AutoParagraph";b:0;s:17:"AutoFormat.Custom";a:0:{}s:25:"AutoFormat.DisplayLinkURI";b:0;s:18:"AutoFormat.Linkify";b:0;s:33:"AutoFormat.PurifierLinkify.DocURL";s:3:"#%s";s:26:"AutoFormat.PurifierLinkify";b:0;s:32:"AutoFormat.RemoveEmpty.Predicate";a:4:{s:8:"colgroup";a:0:{}s:2:"th";a:0:{}s:2:"td";a:0:{}s:6:"iframe";a:1:{i:0;s:3:"src";}}s:44:"AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions";a:2:{s:2:"td";b:1;s:2:"th";b:1;}s:33:"AutoFormat.RemoveEmpty.RemoveNbsp";b:0;s:22:"AutoFormat.RemoveEmpty";b:0;s:39:"AutoFormat.RemoveSpansWithoutAttributes";b:0;s:19:"CSS.AllowDuplicates";b:0;s:18:"CSS.AllowImportant";b:0;s:15:"CSS.AllowTricky";b:0;s:16:"CSS.AllowedFonts";N;s:21:"CSS.AllowedProperties";N;s:17:"CSS.DefinitionRev";i:1;s:23:"CSS.ForbiddenProperties";a:0:{}s:16:"CSS.MaxImgLength";s:6:"1200px";s:15:"CSS.Proprietary";b:0;s:11:"CSS.Trusted";b:0;s:20:"Cache.DefinitionImpl";s:10:"Serializer";s:20:"Cache.SerializerPath";N;s:27:"Cache.SerializerPermissions";i:493;s:22:"Core.AggressivelyFixLt";b:1;s:29:"Core.AggressivelyRemoveScript";b:1;s:28:"Core.AllowHostnameUnderscore";b:0;s:23:"Core.AllowParseManyTags";b:0;s:18:"Core.CollectErrors";b:0;s:18:"Core.ColorKeywords";a:148:{s:9:"aliceblue";s:7:"#F0F8FF";s:12:"antiquewhite";s:7:"#FAEBD7";s:4:"aqua";s:7:"#00FFFF";s:10:"aquamarine";s:7:"#7FFFD4";s:5:"azure";s:7:"#F0FFFF";s:5:"beige";s:7:"#F5F5DC";s:6:"bisque";s:7:"#FFE4C4";s:5:"black";s:7:"#000000";s:14:"blanchedalmond";s:7:"#FFEBCD";s:4:"blue";s:7:"#0000FF";s:10:"blueviolet";s:7:"#8A2BE2";s:5:"brown";s:7:"#A52A2A";s:9:"burlywood";s:7:"#DEB887";s:9:"cadetblue";s:7:"#5F9EA0";s:10:"chartreuse";s:7:"#7FFF00";s:9:"chocolate";s:7:"#D2691E";s:5:"coral";s:7:"#FF7F50";s:14:"cornflowerblue";s:7:"#6495ED";s:8:"cornsilk";s:7:"#FFF8DC";s:7:"crimson";s:7:"#DC143C";s:4:"cyan";s:7:"#00FFFF";s:8:"darkblue";s:7:"#00008B";s:8:"darkcyan";s:7:"#008B8B";s:13:"darkgoldenrod";s:7:"#B8860B";s:8:"darkgray";s:7:"#A9A9A9";s:8:"darkgrey";s:7:"#A9A9A9";s:9:"darkgreen";s:7:"#006400";s:9:"darkkhaki";s:7:"#BDB76B";s:11:"darkmagenta";s:7:"#8B008B";s:14:"darkolivegreen";s:7:"#556B2F";s:10:"darkorange";s:7:"#FF8C00";s:10:"darkorchid";s:7:"#9932CC";s:7:"darkred";s:7:"#8B0000";s:10:"darksalmon";s:7:"#E9967A";s:12:"darkseagreen";s:7:"#8FBC8F";s:13:"darkslateblue";s:7:"#483D8B";s:13:"darkslategray";s:7:"#2F4F4F";s:13:"darkslategrey";s:7:"#2F4F4F";s:13:"darkturquoise";s:7:"#00CED1";s:10:"darkviolet";s:7:"#9400D3";s:8:"deeppink";s:7:"#FF1493";s:11:"deepskyblue";s:7:"#00BFFF";s:7:"dimgray";s:7:"#696969";s:7:"dimgrey";s:7:"#696969";s:10:"dodgerblue";s:7:"#1E90FF";s:9:"firebrick";s:7:"#B22222";s:11:"floralwhite";s:7:"#FFFAF0";s:11:"forestgreen";s:7:"#228B22";s:7:"fuchsia";s:7:"#FF00FF";s:9:"gainsboro";s:7:"#DCDCDC";s:10:"ghostwhite";s:7:"#F8F8FF";s:4:"gold";s:7:"#FFD700";s:9:"goldenrod";s:7:"#DAA520";s:4:"gray";s:7:"#808080";s:4:"grey";s:7:"#808080";s:5:"green";s:7:"#008000";s:11:"greenyellow";s:7:"#ADFF2F";s:8:"honeydew";s:7:"#F0FFF0";s:7:"hotpink";s:7:"#FF69B4";s:9:"indianred";s:7:"#CD5C5C";s:6:"indigo";s:7:"#4B0082";s:5:"ivory";s:7:"#FFFFF0";s:5:"khaki";s:7:"#F0E68C";s:8:"lavender";s:7:"#E6E6FA";s:13:"lavenderblush";s:7:"#FFF0F5";s:9:"lawngreen";s:7:"#7CFC00";s:12:"lemonchiffon";s:7:"#FFFACD";s:9:"lightblue";s:7:"#ADD8E6";s:10:"lightcoral";s:7:"#F08080";s:9:"lightcyan";s:7:"#E0FFFF";s:20:"lightgoldenrodyellow";s:7:"#FAFAD2";s:9:"lightgray";s:7:"#D3D3D3";s:9:"lightgrey";s:7:"#D3D3D3";s:10:"lightgreen";s:7:"#90EE90";s:9:"lightpink";s:7:"#FFB6C1";s:11:"lightsalmon";s:7:"#FFA07A";s:13:"lightseagreen";s:7:"#20B2AA";s:12:"lightskyblue";s:7:"#87CEFA";s:14:"lightslategray";s:7:"#778899";s:14:"lightslategrey";s:7:"#778899";s:14:"lightsteelblue";s:7:"#B0C4DE";s:11:"lightyellow";s:7:"#FFFFE0";s:4:"lime";s:7:"#00FF00";s:9:"limegreen";s:7:"#32CD32";s:5:"linen";s:7:"#FAF0E6";s:7:"magenta";s:7:"#FF00FF";s:6:"maroon";s:7:"#800000";s:16:"mediumaquamarine";s:7:"#66CDAA";s:10:"mediumblue";s:7:"#0000CD";s:12:"mediumorchid";s:7:"#BA55D3";s:12:"mediumpurple";s:7:"#9370DB";s:14:"mediumseagreen";s:7:"#3CB371";s:15:"mediumslateblue";s:7:"#7B68EE";s:17:"mediumspringgreen";s:7:"#00FA9A";s:15:"mediumturquoise";s:7:"#48D1CC";s:15:"mediumvioletred";s:7:"#C71585";s:12:"midnightblue";s:7:"#191970";s:9:"mintcream";s:7:"#F5FFFA";s:9:"mistyrose";s:7:"#FFE4E1";s:8:"moccasin";s:7:"#FFE4B5";s:11:"navajowhite";s:7:"#FFDEAD";s:4:"navy";s:7:"#000080";s:7:"oldlace";s:7:"#FDF5E6";s:5:"olive";s:7:"#808000";s:9:"olivedrab";s:7:"#6B8E23";s:6:"orange";s:7:"#FFA500";s:9:"orangered";s:7:"#FF4500";s:6:"orchid";s:7:"#DA70D6";s:13:"palegoldenrod";s:7:"#EEE8AA";s:9:"palegreen";s:7:"#98FB98";s:13:"paleturquoise";s:7:"#AFEEEE";s:13:"palevioletred";s:7:"#DB7093";s:10:"papayawhip";s:7:"#FFEFD5";s:9:"peachpuff";s:7:"#FFDAB9";s:4:"peru";s:7:"#CD853F";s:4:"pink";s:7:"#FFC0CB";s:4:"plum";s:7:"#DDA0DD";s:10:"powderblue";s:7:"#B0E0E6";s:6:"purple";s:7:"#800080";s:13:"rebeccapurple";s:7:"#663399";s:3:"red";s:7:"#FF0000";s:9:"rosybrown";s:7:"#BC8F8F";s:9:"royalblue";s:7:"#4169E1";s:11:"saddlebrown";s:7:"#8B4513";s:6:"salmon";s:7:"#FA8072";s:10:"sandybrown";s:7:"#F4A460";s:8:"seagreen";s:7:"#2E8B57";s:8:"seashell";s:7:"#FFF5EE";s:6:"sienna";s:7:"#A0522D";s:6:"silver";s:7:"#C0C0C0";s:7:"skyblue";s:7:"#87CEEB";s:9:"slateblue";s:7:"#6A5ACD";s:9:"slategray";s:7:"#708090";s:9:"slategrey";s:7:"#708090";s:4:"snow";s:7:"#FFFAFA";s:11:"springgreen";s:7:"#00FF7F";s:9:"steelblue";s:7:"#4682B4";s:3:"tan";s:7:"#D2B48C";s:4:"teal";s:7:"#008080";s:7:"thistle";s:7:"#D8BFD8";s:6:"tomato";s:7:"#FF6347";s:9:"turquoise";s:7:"#40E0D0";s:6:"violet";s:7:"#EE82EE";s:5:"wheat";s:7:"#F5DEB3";s:5:"white";s:7:"#FFFFFF";s:10:"whitesmoke";s:7:"#F5F5F5";s:6:"yellow";s:7:"#FFFF00";s:11:"yellowgreen";s:7:"#9ACD32";}s:30:"Core.ConvertDocumentToFragment";b:1;s:36:"Core.DirectLexLineNumberSyncInterval";i:0;s:20:"Core.DisableExcludes";b:0;s:15:"Core.EnableIDNA";b:0;s:13:"Core.Encoding";s:5:"utf-8";s:26:"Core.EscapeInvalidChildren";b:0;s:22:"Core.EscapeInvalidTags";b:0;s:29:"Core.EscapeNonASCIICharacters";b:0;s:19:"Core.HiddenElements";a:2:{s:6:"script";b:1;s:5:"style";b:1;}s:13:"Core.Language";s:2:"en";s:24:"Core.LegacyEntityDecoder";b:0;s:14:"Core.LexerImpl";N;s:24:"Core.MaintainLineNumbers";N;s:22:"Core.NormalizeNewlines";b:1;s:17:"Core.RemoveBlanks";b:0;s:21:"Core.RemoveInvalidImg";b:1;s:33:"Core.RemoveProcessingInstructions";b:0;s:25:"Core.RemoveScriptContents";N;s:13:"Filter.Custom";a:0:{}s:34:"Filter.ExtractStyleBlocks.Escaping";b:1;s:31:"Filter.ExtractStyleBlocks.Scope";N;s:34:"Filter.ExtractStyleBlocks.TidyImpl";N;s:25:"Filter.ExtractStyleBlocks";b:0;s:14:"Filter.YouTube";b:0;s:12:"HTML.Allowed";N;s:22:"HTML.AllowedAttributes";N;s:20:"HTML.AllowedComments";a:0:{}s:26:"HTML.AllowedCommentsRegexp";N;s:20:"HTML.AllowedElements";N;s:19:"HTML.AllowedModules";N;s:23:"HTML.Attr.Name.UseCDATA";b:0;s:17:"HTML.BlockWrapper";s:1:"p";s:16:"HTML.CoreModules";a:7:{s:9:"Structure";b:1;s:4:"Text";b:1;s:9:"Hypertext";b:1;s:4:"List";b:1;s:22:"NonXMLCommonAttributes";b:1;s:19:"XMLCommonAttributes";b:1;s:16:"CommonAttributes";b:1;}s:18:"HTML.CustomDoctype";N;s:17:"HTML.DefinitionID";N;s:18:"HTML.DefinitionRev";i:1;s:12:"HTML.Doctype";N;s:25:"HTML.FlashAllowFullScreen";b:0;s:24:"HTML.ForbiddenAttributes";a:0:{}s:22:"HTML.ForbiddenElements";a:0:{}s:10:"HTML.Forms";b:0;s:17:"HTML.MaxImgLength";i:1200;s:13:"HTML.Nofollow";b:0;s:11:"HTML.Parent";s:3:"div";s:16:"HTML.Proprietary";b:0;s:14:"HTML.SafeEmbed";b:0;s:15:"HTML.SafeIframe";b:0;s:15:"HTML.SafeObject";b:0;s:18:"HTML.SafeScripting";a:0:{}s:11:"HTML.Strict";b:0;s:16:"HTML.TargetBlank";b:0;s:19:"HTML.TargetNoopener";b:1;s:21:"HTML.TargetNoreferrer";b:1;s:12:"HTML.TidyAdd";a:0:{}s:14:"HTML.TidyLevel";s:6:"medium";s:15:"HTML.TidyRemove";a:0:{}s:12:"HTML.Trusted";b:0;s:10:"HTML.XHTML";b:1;s:28:"Output.CommentScriptContents";b:1;s:19:"Output.FixInnerHTML";b:1;s:18:"Output.FlashCompat";b:0;s:14:"Output.Newline";N;s:15:"Output.SortAttr";b:0;s:17:"Output.TidyFormat";b:0;s:17:"Test.ForceNoIconv";b:0;s:18:"URI.AllowedSchemes";a:7:{s:4:"http";b:1;s:5:"https";b:1;s:6:"mailto";b:1;s:3:"ftp";b:1;s:4:"nntp";b:1;s:4:"news";b:1;s:3:"tel";b:1;}s:8:"URI.Base";N;s:17:"URI.DefaultScheme";s:4:"http";s:16:"URI.DefinitionID";N;s:17:"URI.DefinitionRev";i:1;s:11:"URI.Disable";b:0;s:19:"URI.DisableExternal";b:0;s:28:"URI.DisableExternalResources";b:0;s:20:"URI.DisableResources";b:0;s:8:"URI.Host";N;s:17:"URI.HostBlacklist";a:0:{}s:16:"URI.MakeAbsolute";b:0;s:9:"URI.Munge";N;s:18:"URI.MungeResources";b:0;s:18:"URI.MungeSecretKey";N;s:26:"URI.OverrideAllowedSchemes";b:1;s:20:"URI.SafeIframeRegexp";N;}s:9:" * parent";N;s:8:" * cache";N;}s:4:"info";a:141:{s:19:"Attr.AllowedClasses";i:-8;s:24:"Attr.AllowedFrameTargets";i:8;s:15:"Attr.AllowedRel";i:8;s:15:"Attr.AllowedRev";i:8;s:18:"Attr.ClassUseCDATA";i:-7;s:20:"Attr.DefaultImageAlt";i:-1;s:24:"Attr.DefaultInvalidImage";i:1;s:27:"Attr.DefaultInvalidImageAlt";i:1;s:19:"Attr.DefaultTextDir";O:8:"stdClass":2:{s:4:"type";i:1;s:7:"allowed";a:2:{s:3:"ltr";b:1;s:3:"rtl";b:1;}}s:13:"Attr.EnableID";i:7;s:17:"HTML.EnableAttrID";O:8:"stdClass":2:{s:3:"key";s:13:"Attr.EnableID";s:7:"isAlias";b:1;}s:21:"Attr.ForbiddenClasses";i:8;s:13:"Attr.ID.HTML5";i:-7;s:16:"Attr.IDBlacklist";i:9;s:22:"Attr.IDBlacklistRegexp";i:-1;s:13:"Attr.IDPrefix";i:1;s:18:"Attr.IDPrefixLocal";i:1;s:24:"AutoFormat.AutoParagraph";i:7;s:17:"AutoFormat.Custom";i:9;s:25:"AutoFormat.DisplayLinkURI";i:7;s:18:"AutoFormat.Linkify";i:7;s:33:"AutoFormat.PurifierLinkify.DocURL";i:1;s:37:"AutoFormatParam.PurifierLinkifyDocURL";O:8:"stdClass":2:{s:3:"key";s:33:"AutoFormat.PurifierLinkify.DocURL";s:7:"isAlias";b:1;}s:26:"AutoFormat.PurifierLinkify";i:7;s:32:"AutoFormat.RemoveEmpty.Predicate";i:10;s:44:"AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions";i:8;s:33:"AutoFormat.RemoveEmpty.RemoveNbsp";i:7;s:22:"AutoFormat.RemoveEmpty";i:7;s:39:"AutoFormat.RemoveSpansWithoutAttributes";i:7;s:19:"CSS.AllowDuplicates";i:7;s:18:"CSS.AllowImportant";i:7;s:15:"CSS.AllowTricky";i:7;s:16:"CSS.AllowedFonts";i:-8;s:21:"CSS.AllowedProperties";i:-8;s:17:"CSS.DefinitionRev";i:5;s:23:"CSS.ForbiddenProperties";i:8;s:16:"CSS.MaxImgLength";i:-1;s:15:"CSS.Proprietary";i:7;s:11:"CSS.Trusted";i:7;s:20:"Cache.DefinitionImpl";i:-1;s:20:"Core.DefinitionCache";O:8:"stdClass":2:{s:3:"key";s:20:"Cache.DefinitionImpl";s:7:"isAlias";b:1;}s:20:"Cache.SerializerPath";i:-1;s:27:"Cache.SerializerPermissions";i:-5;s:22:"Core.AggressivelyFixLt";i:7;s:29:"Core.AggressivelyRemoveScript";i:7;s:28:"Core.AllowHostnameUnderscore";i:7;s:23:"Core.AllowParseManyTags";i:7;s:18:"Core.CollectErrors";i:7;s:18:"Core.ColorKeywords";i:10;s:30:"Core.ConvertDocumentToFragment";i:7;s:24:"Core.AcceptFullDocuments";O:8:"stdClass":2:{s:3:"key";s:30:"Core.ConvertDocumentToFragment";s:7:"isAlias";b:1;}s:36:"Core.DirectLexLineNumberSyncInterval";i:5;s:20:"Core.DisableExcludes";i:7;s:15:"Core.EnableIDNA";i:7;s:13:"Core.Encoding";i:2;s:26:"Core.EscapeInvalidChildren";i:7;s:22:"Core.EscapeInvalidTags";i:7;s:29:"Core.EscapeNonASCIICharacters";i:7;s:19:"Core.HiddenElements";i:8;s:13:"Core.Language";i:1;s:24:"Core.LegacyEntityDecoder";i:7;s:14:"Core.LexerImpl";i:-11;s:24:"Core.MaintainLineNumbers";i:-7;s:22:"Core.NormalizeNewlines";i:7;s:17:"Core.RemoveBlanks";i:7;s:21:"Core.RemoveInvalidImg";i:7;s:33:"Core.RemoveProcessingInstructions";i:7;s:25:"Core.RemoveScriptContents";i:-7;s:13:"Filter.Custom";i:9;s:34:"Filter.ExtractStyleBlocks.Escaping";i:7;s:33:"Filter.ExtractStyleBlocksEscaping";O:8:"stdClass":2:{s:3:"key";s:34:"Filter.ExtractStyleBlocks.Escaping";s:7:"isAlias";b:1;}s:38:"FilterParam.ExtractStyleBlocksEscaping";O:8:"stdClass":2:{s:3:"key";s:34:"Filter.ExtractStyleBlocks.Escaping";s:7:"isAlias";b:1;}s:31:"Filter.ExtractStyleBlocks.Scope";i:-1;s:30:"Filter.ExtractStyleBlocksScope";O:8:"stdClass":2:{s:3:"key";s:31:"Filter.ExtractStyleBlocks.Scope";s:7:"isAlias";b:1;}s:35:"FilterParam.ExtractStyleBlocksScope";O:8:"stdClass":2:{s:3:"key";s:31:"Filter.ExtractStyleBlocks.Scope";s:7:"isAlias";b:1;}s:34:"Filter.ExtractStyleBlocks.TidyImpl";i:-11;s:38:"FilterParam.ExtractStyleBlocksTidyImpl";O:8:"stdClass":2:{s:3:"key";s:34:"Filter.ExtractStyleBlocks.TidyImpl";s:7:"isAlias";b:1;}s:25:"Filter.ExtractStyleBlocks";i:7;s:14:"Filter.YouTube";i:7;s:12:"HTML.Allowed";i:-4;s:22:"HTML.AllowedAttributes";i:-8;s:20:"HTML.AllowedComments";i:8;s:26:"HTML.AllowedCommentsRegexp";i:-1;s:20:"HTML.AllowedElements";i:-8;s:19:"HTML.AllowedModules";i:-8;s:23:"HTML.Attr.Name.UseCDATA";i:7;s:17:"HTML.BlockWrapper";i:1;s:16:"HTML.CoreModules";i:8;s:18:"HTML.CustomDoctype";i:-1;s:17:"HTML.DefinitionID";i:-1;s:18:"HTML.DefinitionRev";i:5;s:12:"HTML.Doctype";O:8:"stdClass":3:{s:4:"type";i:1;s:10:"allow_null";b:1;s:7:"allowed";a:5:{s:22:"HTML 4.01 Transitional";b:1;s:16:"HTML 4.01 Strict";b:1;s:22:"XHTML 1.0 Transitional";b:1;s:16:"XHTML 1.0 Strict";b:1;s:9:"XHTML 1.1";b:1;}}s:25:"HTML.FlashAllowFullScreen";i:7;s:24:"HTML.ForbiddenAttributes";i:8;s:22:"HTML.ForbiddenElements";i:8;s:10:"HTML.Forms";i:7;s:17:"HTML.MaxImgLength";i:-5;s:13:"HTML.Nofollow";i:7;s:11:"HTML.Parent";i:1;s:16:"HTML.Proprietary";i:7;s:14:"HTML.SafeEmbed";i:7;s:15:"HTML.SafeIframe";i:7;s:15:"HTML.SafeObject";i:7;s:18:"HTML.SafeScripting";i:8;s:11:"HTML.Strict";i:7;s:16:"HTML.TargetBlank";i:7;s:19:"HTML.TargetNoopener";i:7;s:21:"HTML.TargetNoreferrer";i:7;s:12:"HTML.TidyAdd";i:8;s:14:"HTML.TidyLevel";O:8:"stdClass":2:{s:4:"type";i:1;s:7:"allowed";a:4:{s:4:"none";b:1;s:5:"light";b:1;s:6:"medium";b:1;s:5:"heavy";b:1;}}s:15:"HTML.TidyRemove";i:8;s:12:"HTML.Trusted";i:7;s:10:"HTML.XHTML";i:7;s:10:"Core.XHTML";O:8:"stdClass":2:{s:3:"key";s:10:"HTML.XHTML";s:7:"isAlias";b:1;}s:28:"Output.CommentScriptContents";i:7;s:26:"Core.CommentScriptContents";O:8:"stdClass":2:{s:3:"key";s:28:"Output.CommentScriptContents";s:7:"isAlias";b:1;}s:19:"Output.FixInnerHTML";i:7;s:18:"Output.FlashCompat";i:7;s:14:"Output.Newline";i:-1;s:15:"Output.SortAttr";i:7;s:17:"Output.TidyFormat";i:7;s:15:"Core.TidyFormat";O:8:"stdClass":2:{s:3:"key";s:17:"Output.TidyFormat";s:7:"isAlias";b:1;}s:17:"Test.ForceNoIconv";i:7;s:18:"URI.AllowedSchemes";i:8;s:8:"URI.Base";i:-1;s:17:"URI.DefaultScheme";i:-1;s:16:"URI.DefinitionID";i:-1;s:17:"URI.DefinitionRev";i:5;s:11:"URI.Disable";i:7;s:15:"Attr.DisableURI";O:8:"stdClass":2:{s:3:"key";s:11:"URI.Disable";s:7:"isAlias";b:1;}s:19:"URI.DisableExternal";i:7;s:28:"URI.DisableExternalResources";i:7;s:20:"URI.DisableResources";i:7;s:8:"URI.Host";i:-1;s:17:"URI.HostBlacklist";i:9;s:16:"URI.MakeAbsolute";i:7;s:9:"URI.Munge";i:-1;s:18:"URI.MungeResources";i:7;s:18:"URI.MungeSecretKey";i:-1;s:26:"URI.OverrideAllowedSchemes";i:7;s:20:"URI.SafeIframeRegexp";i:-1;}}
\ No newline at end of file
+O:25:"HTMLPurifier_ConfigSchema":3:{s:8:"defaults";a:130:{s:19:"Attr.AllowedClasses";N;s:24:"Attr.AllowedFrameTargets";a:0:{}s:15:"Attr.AllowedRel";a:0:{}s:15:"Attr.AllowedRev";a:0:{}s:18:"Attr.ClassUseCDATA";N;s:20:"Attr.DefaultImageAlt";N;s:24:"Attr.DefaultInvalidImage";s:0:"";s:27:"Attr.DefaultInvalidImageAlt";s:13:"Invalid image";s:19:"Attr.DefaultTextDir";s:3:"ltr";s:13:"Attr.EnableID";b:0;s:21:"Attr.ForbiddenClasses";a:0:{}s:13:"Attr.ID.HTML5";N;s:16:"Attr.IDBlacklist";a:0:{}s:22:"Attr.IDBlacklistRegexp";N;s:13:"Attr.IDPrefix";s:0:"";s:18:"Attr.IDPrefixLocal";s:0:"";s:24:"AutoFormat.AutoParagraph";b:0;s:17:"AutoFormat.Custom";a:0:{}s:25:"AutoFormat.DisplayLinkURI";b:0;s:18:"AutoFormat.Linkify";b:0;s:33:"AutoFormat.PurifierLinkify.DocURL";s:3:"#%s";s:26:"AutoFormat.PurifierLinkify";b:0;s:32:"AutoFormat.RemoveEmpty.Predicate";a:4:{s:8:"colgroup";a:0:{}s:2:"th";a:0:{}s:2:"td";a:0:{}s:6:"iframe";a:1:{i:0;s:3:"src";}}s:44:"AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions";a:2:{s:2:"td";b:1;s:2:"th";b:1;}s:33:"AutoFormat.RemoveEmpty.RemoveNbsp";b:0;s:22:"AutoFormat.RemoveEmpty";b:0;s:39:"AutoFormat.RemoveSpansWithoutAttributes";b:0;s:19:"CSS.AllowDuplicates";b:0;s:18:"CSS.AllowImportant";b:0;s:15:"CSS.AllowTricky";b:0;s:16:"CSS.AllowedFonts";N;s:21:"CSS.AllowedProperties";N;s:17:"CSS.DefinitionRev";i:1;s:23:"CSS.ForbiddenProperties";a:0:{}s:16:"CSS.MaxImgLength";N;s:15:"CSS.Proprietary";b:0;s:11:"CSS.Trusted";b:0;s:20:"Cache.DefinitionImpl";s:10:"Serializer";s:20:"Cache.SerializerPath";N;s:27:"Cache.SerializerPermissions";i:493;s:22:"Core.AggressivelyFixLt";b:1;s:29:"Core.AggressivelyRemoveScript";b:1;s:28:"Core.AllowHostnameUnderscore";b:0;s:23:"Core.AllowParseManyTags";b:0;s:18:"Core.CollectErrors";b:0;s:18:"Core.ColorKeywords";a:148:{s:9:"aliceblue";s:7:"#F0F8FF";s:12:"antiquewhite";s:7:"#FAEBD7";s:4:"aqua";s:7:"#00FFFF";s:10:"aquamarine";s:7:"#7FFFD4";s:5:"azure";s:7:"#F0FFFF";s:5:"beige";s:7:"#F5F5DC";s:6:"bisque";s:7:"#FFE4C4";s:5:"black";s:7:"#000000";s:14:"blanchedalmond";s:7:"#FFEBCD";s:4:"blue";s:7:"#0000FF";s:10:"blueviolet";s:7:"#8A2BE2";s:5:"brown";s:7:"#A52A2A";s:9:"burlywood";s:7:"#DEB887";s:9:"cadetblue";s:7:"#5F9EA0";s:10:"chartreuse";s:7:"#7FFF00";s:9:"chocolate";s:7:"#D2691E";s:5:"coral";s:7:"#FF7F50";s:14:"cornflowerblue";s:7:"#6495ED";s:8:"cornsilk";s:7:"#FFF8DC";s:7:"crimson";s:7:"#DC143C";s:4:"cyan";s:7:"#00FFFF";s:8:"darkblue";s:7:"#00008B";s:8:"darkcyan";s:7:"#008B8B";s:13:"darkgoldenrod";s:7:"#B8860B";s:8:"darkgray";s:7:"#A9A9A9";s:8:"darkgrey";s:7:"#A9A9A9";s:9:"darkgreen";s:7:"#006400";s:9:"darkkhaki";s:7:"#BDB76B";s:11:"darkmagenta";s:7:"#8B008B";s:14:"darkolivegreen";s:7:"#556B2F";s:10:"darkorange";s:7:"#FF8C00";s:10:"darkorchid";s:7:"#9932CC";s:7:"darkred";s:7:"#8B0000";s:10:"darksalmon";s:7:"#E9967A";s:12:"darkseagreen";s:7:"#8FBC8F";s:13:"darkslateblue";s:7:"#483D8B";s:13:"darkslategray";s:7:"#2F4F4F";s:13:"darkslategrey";s:7:"#2F4F4F";s:13:"darkturquoise";s:7:"#00CED1";s:10:"darkviolet";s:7:"#9400D3";s:8:"deeppink";s:7:"#FF1493";s:11:"deepskyblue";s:7:"#00BFFF";s:7:"dimgray";s:7:"#696969";s:7:"dimgrey";s:7:"#696969";s:10:"dodgerblue";s:7:"#1E90FF";s:9:"firebrick";s:7:"#B22222";s:11:"floralwhite";s:7:"#FFFAF0";s:11:"forestgreen";s:7:"#228B22";s:7:"fuchsia";s:7:"#FF00FF";s:9:"gainsboro";s:7:"#DCDCDC";s:10:"ghostwhite";s:7:"#F8F8FF";s:4:"gold";s:7:"#FFD700";s:9:"goldenrod";s:7:"#DAA520";s:4:"gray";s:7:"#808080";s:4:"grey";s:7:"#808080";s:5:"green";s:7:"#008000";s:11:"greenyellow";s:7:"#ADFF2F";s:8:"honeydew";s:7:"#F0FFF0";s:7:"hotpink";s:7:"#FF69B4";s:9:"indianred";s:7:"#CD5C5C";s:6:"indigo";s:7:"#4B0082";s:5:"ivory";s:7:"#FFFFF0";s:5:"khaki";s:7:"#F0E68C";s:8:"lavender";s:7:"#E6E6FA";s:13:"lavenderblush";s:7:"#FFF0F5";s:9:"lawngreen";s:7:"#7CFC00";s:12:"lemonchiffon";s:7:"#FFFACD";s:9:"lightblue";s:7:"#ADD8E6";s:10:"lightcoral";s:7:"#F08080";s:9:"lightcyan";s:7:"#E0FFFF";s:20:"lightgoldenrodyellow";s:7:"#FAFAD2";s:9:"lightgray";s:7:"#D3D3D3";s:9:"lightgrey";s:7:"#D3D3D3";s:10:"lightgreen";s:7:"#90EE90";s:9:"lightpink";s:7:"#FFB6C1";s:11:"lightsalmon";s:7:"#FFA07A";s:13:"lightseagreen";s:7:"#20B2AA";s:12:"lightskyblue";s:7:"#87CEFA";s:14:"lightslategray";s:7:"#778899";s:14:"lightslategrey";s:7:"#778899";s:14:"lightsteelblue";s:7:"#B0C4DE";s:11:"lightyellow";s:7:"#FFFFE0";s:4:"lime";s:7:"#00FF00";s:9:"limegreen";s:7:"#32CD32";s:5:"linen";s:7:"#FAF0E6";s:7:"magenta";s:7:"#FF00FF";s:6:"maroon";s:7:"#800000";s:16:"mediumaquamarine";s:7:"#66CDAA";s:10:"mediumblue";s:7:"#0000CD";s:12:"mediumorchid";s:7:"#BA55D3";s:12:"mediumpurple";s:7:"#9370DB";s:14:"mediumseagreen";s:7:"#3CB371";s:15:"mediumslateblue";s:7:"#7B68EE";s:17:"mediumspringgreen";s:7:"#00FA9A";s:15:"mediumturquoise";s:7:"#48D1CC";s:15:"mediumvioletred";s:7:"#C71585";s:12:"midnightblue";s:7:"#191970";s:9:"mintcream";s:7:"#F5FFFA";s:9:"mistyrose";s:7:"#FFE4E1";s:8:"moccasin";s:7:"#FFE4B5";s:11:"navajowhite";s:7:"#FFDEAD";s:4:"navy";s:7:"#000080";s:7:"oldlace";s:7:"#FDF5E6";s:5:"olive";s:7:"#808000";s:9:"olivedrab";s:7:"#6B8E23";s:6:"orange";s:7:"#FFA500";s:9:"orangered";s:7:"#FF4500";s:6:"orchid";s:7:"#DA70D6";s:13:"palegoldenrod";s:7:"#EEE8AA";s:9:"palegreen";s:7:"#98FB98";s:13:"paleturquoise";s:7:"#AFEEEE";s:13:"palevioletred";s:7:"#DB7093";s:10:"papayawhip";s:7:"#FFEFD5";s:9:"peachpuff";s:7:"#FFDAB9";s:4:"peru";s:7:"#CD853F";s:4:"pink";s:7:"#FFC0CB";s:4:"plum";s:7:"#DDA0DD";s:10:"powderblue";s:7:"#B0E0E6";s:6:"purple";s:7:"#800080";s:13:"rebeccapurple";s:7:"#663399";s:3:"red";s:7:"#FF0000";s:9:"rosybrown";s:7:"#BC8F8F";s:9:"royalblue";s:7:"#4169E1";s:11:"saddlebrown";s:7:"#8B4513";s:6:"salmon";s:7:"#FA8072";s:10:"sandybrown";s:7:"#F4A460";s:8:"seagreen";s:7:"#2E8B57";s:8:"seashell";s:7:"#FFF5EE";s:6:"sienna";s:7:"#A0522D";s:6:"silver";s:7:"#C0C0C0";s:7:"skyblue";s:7:"#87CEEB";s:9:"slateblue";s:7:"#6A5ACD";s:9:"slategray";s:7:"#708090";s:9:"slategrey";s:7:"#708090";s:4:"snow";s:7:"#FFFAFA";s:11:"springgreen";s:7:"#00FF7F";s:9:"steelblue";s:7:"#4682B4";s:3:"tan";s:7:"#D2B48C";s:4:"teal";s:7:"#008080";s:7:"thistle";s:7:"#D8BFD8";s:6:"tomato";s:7:"#FF6347";s:9:"turquoise";s:7:"#40E0D0";s:6:"violet";s:7:"#EE82EE";s:5:"wheat";s:7:"#F5DEB3";s:5:"white";s:7:"#FFFFFF";s:10:"whitesmoke";s:7:"#F5F5F5";s:6:"yellow";s:7:"#FFFF00";s:11:"yellowgreen";s:7:"#9ACD32";}s:30:"Core.ConvertDocumentToFragment";b:1;s:36:"Core.DirectLexLineNumberSyncInterval";i:0;s:20:"Core.DisableExcludes";b:0;s:15:"Core.EnableIDNA";b:0;s:13:"Core.Encoding";s:5:"utf-8";s:26:"Core.EscapeInvalidChildren";b:0;s:22:"Core.EscapeInvalidTags";b:0;s:29:"Core.EscapeNonASCIICharacters";b:0;s:19:"Core.HiddenElements";a:2:{s:6:"script";b:1;s:5:"style";b:1;}s:13:"Core.Language";s:2:"en";s:24:"Core.LegacyEntityDecoder";b:0;s:14:"Core.LexerImpl";N;s:24:"Core.MaintainLineNumbers";N;s:22:"Core.NormalizeNewlines";b:1;s:17:"Core.RemoveBlanks";b:0;s:21:"Core.RemoveInvalidImg";b:1;s:33:"Core.RemoveProcessingInstructions";b:0;s:25:"Core.RemoveScriptContents";N;s:13:"Filter.Custom";a:0:{}s:34:"Filter.ExtractStyleBlocks.Escaping";b:1;s:31:"Filter.ExtractStyleBlocks.Scope";N;s:34:"Filter.ExtractStyleBlocks.TidyImpl";N;s:25:"Filter.ExtractStyleBlocks";b:0;s:14:"Filter.YouTube";b:0;s:12:"HTML.Allowed";N;s:22:"HTML.AllowedAttributes";N;s:20:"HTML.AllowedComments";a:0:{}s:26:"HTML.AllowedCommentsRegexp";N;s:20:"HTML.AllowedElements";N;s:19:"HTML.AllowedModules";N;s:23:"HTML.Attr.Name.UseCDATA";b:0;s:17:"HTML.BlockWrapper";s:1:"p";s:16:"HTML.CoreModules";a:7:{s:9:"Structure";b:1;s:4:"Text";b:1;s:9:"Hypertext";b:1;s:4:"List";b:1;s:22:"NonXMLCommonAttributes";b:1;s:19:"XMLCommonAttributes";b:1;s:16:"CommonAttributes";b:1;}s:18:"HTML.CustomDoctype";N;s:17:"HTML.DefinitionID";N;s:18:"HTML.DefinitionRev";i:1;s:12:"HTML.Doctype";N;s:25:"HTML.FlashAllowFullScreen";b:0;s:24:"HTML.ForbiddenAttributes";a:0:{}s:22:"HTML.ForbiddenElements";a:0:{}s:10:"HTML.Forms";b:0;s:17:"HTML.MaxImgLength";N;s:13:"HTML.Nofollow";b:0;s:11:"HTML.Parent";s:3:"div";s:16:"HTML.Proprietary";b:0;s:14:"HTML.SafeEmbed";b:0;s:15:"HTML.SafeIframe";b:0;s:15:"HTML.SafeObject";b:0;s:18:"HTML.SafeScripting";a:0:{}s:11:"HTML.Strict";b:0;s:16:"HTML.TargetBlank";b:0;s:19:"HTML.TargetNoopener";b:1;s:21:"HTML.TargetNoreferrer";b:1;s:12:"HTML.TidyAdd";a:0:{}s:14:"HTML.TidyLevel";s:6:"medium";s:15:"HTML.TidyRemove";a:0:{}s:12:"HTML.Trusted";b:0;s:10:"HTML.XHTML";b:1;s:28:"Output.CommentScriptContents";b:1;s:19:"Output.FixInnerHTML";b:1;s:18:"Output.FlashCompat";b:0;s:14:"Output.Newline";N;s:15:"Output.SortAttr";b:0;s:17:"Output.TidyFormat";b:0;s:17:"Test.ForceNoIconv";b:0;s:18:"URI.AllowedSchemes";a:7:{s:4:"http";b:1;s:5:"https";b:1;s:6:"mailto";b:1;s:3:"ftp";b:1;s:4:"nntp";b:1;s:4:"news";b:1;s:3:"tel";b:1;}s:18:"URI.AllowedSymbols";s:11:"!$&'()*+,;=";s:8:"URI.Base";N;s:17:"URI.DefaultScheme";s:4:"http";s:16:"URI.DefinitionID";N;s:17:"URI.DefinitionRev";i:1;s:11:"URI.Disable";b:0;s:19:"URI.DisableExternal";b:0;s:28:"URI.DisableExternalResources";b:0;s:20:"URI.DisableResources";b:0;s:8:"URI.Host";N;s:17:"URI.HostBlacklist";a:0:{}s:16:"URI.MakeAbsolute";b:0;s:9:"URI.Munge";N;s:18:"URI.MungeResources";b:0;s:18:"URI.MungeSecretKey";N;s:26:"URI.OverrideAllowedSchemes";b:1;s:19:"URI.SafeIframeHosts";N;s:20:"URI.SafeIframeRegexp";N;}s:12:"defaultPlist";O:25:"HTMLPurifier_PropertyList":3:{s:7:" * data";a:130:{s:19:"Attr.AllowedClasses";N;s:24:"Attr.AllowedFrameTargets";a:0:{}s:15:"Attr.AllowedRel";a:0:{}s:15:"Attr.AllowedRev";a:0:{}s:18:"Attr.ClassUseCDATA";N;s:20:"Attr.DefaultImageAlt";N;s:24:"Attr.DefaultInvalidImage";s:0:"";s:27:"Attr.DefaultInvalidImageAlt";s:13:"Invalid image";s:19:"Attr.DefaultTextDir";s:3:"ltr";s:13:"Attr.EnableID";b:0;s:21:"Attr.ForbiddenClasses";a:0:{}s:13:"Attr.ID.HTML5";N;s:16:"Attr.IDBlacklist";a:0:{}s:22:"Attr.IDBlacklistRegexp";N;s:13:"Attr.IDPrefix";s:0:"";s:18:"Attr.IDPrefixLocal";s:0:"";s:24:"AutoFormat.AutoParagraph";b:0;s:17:"AutoFormat.Custom";a:0:{}s:25:"AutoFormat.DisplayLinkURI";b:0;s:18:"AutoFormat.Linkify";b:0;s:33:"AutoFormat.PurifierLinkify.DocURL";s:3:"#%s";s:26:"AutoFormat.PurifierLinkify";b:0;s:32:"AutoFormat.RemoveEmpty.Predicate";a:4:{s:8:"colgroup";a:0:{}s:2:"th";a:0:{}s:2:"td";a:0:{}s:6:"iframe";a:1:{i:0;s:3:"src";}}s:44:"AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions";a:2:{s:2:"td";b:1;s:2:"th";b:1;}s:33:"AutoFormat.RemoveEmpty.RemoveNbsp";b:0;s:22:"AutoFormat.RemoveEmpty";b:0;s:39:"AutoFormat.RemoveSpansWithoutAttributes";b:0;s:19:"CSS.AllowDuplicates";b:0;s:18:"CSS.AllowImportant";b:0;s:15:"CSS.AllowTricky";b:0;s:16:"CSS.AllowedFonts";N;s:21:"CSS.AllowedProperties";N;s:17:"CSS.DefinitionRev";i:1;s:23:"CSS.ForbiddenProperties";a:0:{}s:16:"CSS.MaxImgLength";N;s:15:"CSS.Proprietary";b:0;s:11:"CSS.Trusted";b:0;s:20:"Cache.DefinitionImpl";s:10:"Serializer";s:20:"Cache.SerializerPath";N;s:27:"Cache.SerializerPermissions";i:493;s:22:"Core.AggressivelyFixLt";b:1;s:29:"Core.AggressivelyRemoveScript";b:1;s:28:"Core.AllowHostnameUnderscore";b:0;s:23:"Core.AllowParseManyTags";b:0;s:18:"Core.CollectErrors";b:0;s:18:"Core.ColorKeywords";a:148:{s:9:"aliceblue";s:7:"#F0F8FF";s:12:"antiquewhite";s:7:"#FAEBD7";s:4:"aqua";s:7:"#00FFFF";s:10:"aquamarine";s:7:"#7FFFD4";s:5:"azure";s:7:"#F0FFFF";s:5:"beige";s:7:"#F5F5DC";s:6:"bisque";s:7:"#FFE4C4";s:5:"black";s:7:"#000000";s:14:"blanchedalmond";s:7:"#FFEBCD";s:4:"blue";s:7:"#0000FF";s:10:"blueviolet";s:7:"#8A2BE2";s:5:"brown";s:7:"#A52A2A";s:9:"burlywood";s:7:"#DEB887";s:9:"cadetblue";s:7:"#5F9EA0";s:10:"chartreuse";s:7:"#7FFF00";s:9:"chocolate";s:7:"#D2691E";s:5:"coral";s:7:"#FF7F50";s:14:"cornflowerblue";s:7:"#6495ED";s:8:"cornsilk";s:7:"#FFF8DC";s:7:"crimson";s:7:"#DC143C";s:4:"cyan";s:7:"#00FFFF";s:8:"darkblue";s:7:"#00008B";s:8:"darkcyan";s:7:"#008B8B";s:13:"darkgoldenrod";s:7:"#B8860B";s:8:"darkgray";s:7:"#A9A9A9";s:8:"darkgrey";s:7:"#A9A9A9";s:9:"darkgreen";s:7:"#006400";s:9:"darkkhaki";s:7:"#BDB76B";s:11:"darkmagenta";s:7:"#8B008B";s:14:"darkolivegreen";s:7:"#556B2F";s:10:"darkorange";s:7:"#FF8C00";s:10:"darkorchid";s:7:"#9932CC";s:7:"darkred";s:7:"#8B0000";s:10:"darksalmon";s:7:"#E9967A";s:12:"darkseagreen";s:7:"#8FBC8F";s:13:"darkslateblue";s:7:"#483D8B";s:13:"darkslategray";s:7:"#2F4F4F";s:13:"darkslategrey";s:7:"#2F4F4F";s:13:"darkturquoise";s:7:"#00CED1";s:10:"darkviolet";s:7:"#9400D3";s:8:"deeppink";s:7:"#FF1493";s:11:"deepskyblue";s:7:"#00BFFF";s:7:"dimgray";s:7:"#696969";s:7:"dimgrey";s:7:"#696969";s:10:"dodgerblue";s:7:"#1E90FF";s:9:"firebrick";s:7:"#B22222";s:11:"floralwhite";s:7:"#FFFAF0";s:11:"forestgreen";s:7:"#228B22";s:7:"fuchsia";s:7:"#FF00FF";s:9:"gainsboro";s:7:"#DCDCDC";s:10:"ghostwhite";s:7:"#F8F8FF";s:4:"gold";s:7:"#FFD700";s:9:"goldenrod";s:7:"#DAA520";s:4:"gray";s:7:"#808080";s:4:"grey";s:7:"#808080";s:5:"green";s:7:"#008000";s:11:"greenyellow";s:7:"#ADFF2F";s:8:"honeydew";s:7:"#F0FFF0";s:7:"hotpink";s:7:"#FF69B4";s:9:"indianred";s:7:"#CD5C5C";s:6:"indigo";s:7:"#4B0082";s:5:"ivory";s:7:"#FFFFF0";s:5:"khaki";s:7:"#F0E68C";s:8:"lavender";s:7:"#E6E6FA";s:13:"lavenderblush";s:7:"#FFF0F5";s:9:"lawngreen";s:7:"#7CFC00";s:12:"lemonchiffon";s:7:"#FFFACD";s:9:"lightblue";s:7:"#ADD8E6";s:10:"lightcoral";s:7:"#F08080";s:9:"lightcyan";s:7:"#E0FFFF";s:20:"lightgoldenrodyellow";s:7:"#FAFAD2";s:9:"lightgray";s:7:"#D3D3D3";s:9:"lightgrey";s:7:"#D3D3D3";s:10:"lightgreen";s:7:"#90EE90";s:9:"lightpink";s:7:"#FFB6C1";s:11:"lightsalmon";s:7:"#FFA07A";s:13:"lightseagreen";s:7:"#20B2AA";s:12:"lightskyblue";s:7:"#87CEFA";s:14:"lightslategray";s:7:"#778899";s:14:"lightslategrey";s:7:"#778899";s:14:"lightsteelblue";s:7:"#B0C4DE";s:11:"lightyellow";s:7:"#FFFFE0";s:4:"lime";s:7:"#00FF00";s:9:"limegreen";s:7:"#32CD32";s:5:"linen";s:7:"#FAF0E6";s:7:"magenta";s:7:"#FF00FF";s:6:"maroon";s:7:"#800000";s:16:"mediumaquamarine";s:7:"#66CDAA";s:10:"mediumblue";s:7:"#0000CD";s:12:"mediumorchid";s:7:"#BA55D3";s:12:"mediumpurple";s:7:"#9370DB";s:14:"mediumseagreen";s:7:"#3CB371";s:15:"mediumslateblue";s:7:"#7B68EE";s:17:"mediumspringgreen";s:7:"#00FA9A";s:15:"mediumturquoise";s:7:"#48D1CC";s:15:"mediumvioletred";s:7:"#C71585";s:12:"midnightblue";s:7:"#191970";s:9:"mintcream";s:7:"#F5FFFA";s:9:"mistyrose";s:7:"#FFE4E1";s:8:"moccasin";s:7:"#FFE4B5";s:11:"navajowhite";s:7:"#FFDEAD";s:4:"navy";s:7:"#000080";s:7:"oldlace";s:7:"#FDF5E6";s:5:"olive";s:7:"#808000";s:9:"olivedrab";s:7:"#6B8E23";s:6:"orange";s:7:"#FFA500";s:9:"orangered";s:7:"#FF4500";s:6:"orchid";s:7:"#DA70D6";s:13:"palegoldenrod";s:7:"#EEE8AA";s:9:"palegreen";s:7:"#98FB98";s:13:"paleturquoise";s:7:"#AFEEEE";s:13:"palevioletred";s:7:"#DB7093";s:10:"papayawhip";s:7:"#FFEFD5";s:9:"peachpuff";s:7:"#FFDAB9";s:4:"peru";s:7:"#CD853F";s:4:"pink";s:7:"#FFC0CB";s:4:"plum";s:7:"#DDA0DD";s:10:"powderblue";s:7:"#B0E0E6";s:6:"purple";s:7:"#800080";s:13:"rebeccapurple";s:7:"#663399";s:3:"red";s:7:"#FF0000";s:9:"rosybrown";s:7:"#BC8F8F";s:9:"royalblue";s:7:"#4169E1";s:11:"saddlebrown";s:7:"#8B4513";s:6:"salmon";s:7:"#FA8072";s:10:"sandybrown";s:7:"#F4A460";s:8:"seagreen";s:7:"#2E8B57";s:8:"seashell";s:7:"#FFF5EE";s:6:"sienna";s:7:"#A0522D";s:6:"silver";s:7:"#C0C0C0";s:7:"skyblue";s:7:"#87CEEB";s:9:"slateblue";s:7:"#6A5ACD";s:9:"slategray";s:7:"#708090";s:9:"slategrey";s:7:"#708090";s:4:"snow";s:7:"#FFFAFA";s:11:"springgreen";s:7:"#00FF7F";s:9:"steelblue";s:7:"#4682B4";s:3:"tan";s:7:"#D2B48C";s:4:"teal";s:7:"#008080";s:7:"thistle";s:7:"#D8BFD8";s:6:"tomato";s:7:"#FF6347";s:9:"turquoise";s:7:"#40E0D0";s:6:"violet";s:7:"#EE82EE";s:5:"wheat";s:7:"#F5DEB3";s:5:"white";s:7:"#FFFFFF";s:10:"whitesmoke";s:7:"#F5F5F5";s:6:"yellow";s:7:"#FFFF00";s:11:"yellowgreen";s:7:"#9ACD32";}s:30:"Core.ConvertDocumentToFragment";b:1;s:36:"Core.DirectLexLineNumberSyncInterval";i:0;s:20:"Core.DisableExcludes";b:0;s:15:"Core.EnableIDNA";b:0;s:13:"Core.Encoding";s:5:"utf-8";s:26:"Core.EscapeInvalidChildren";b:0;s:22:"Core.EscapeInvalidTags";b:0;s:29:"Core.EscapeNonASCIICharacters";b:0;s:19:"Core.HiddenElements";a:2:{s:6:"script";b:1;s:5:"style";b:1;}s:13:"Core.Language";s:2:"en";s:24:"Core.LegacyEntityDecoder";b:0;s:14:"Core.LexerImpl";N;s:24:"Core.MaintainLineNumbers";N;s:22:"Core.NormalizeNewlines";b:1;s:17:"Core.RemoveBlanks";b:0;s:21:"Core.RemoveInvalidImg";b:1;s:33:"Core.RemoveProcessingInstructions";b:0;s:25:"Core.RemoveScriptContents";N;s:13:"Filter.Custom";a:0:{}s:34:"Filter.ExtractStyleBlocks.Escaping";b:1;s:31:"Filter.ExtractStyleBlocks.Scope";N;s:34:"Filter.ExtractStyleBlocks.TidyImpl";N;s:25:"Filter.ExtractStyleBlocks";b:0;s:14:"Filter.YouTube";b:0;s:12:"HTML.Allowed";N;s:22:"HTML.AllowedAttributes";N;s:20:"HTML.AllowedComments";a:0:{}s:26:"HTML.AllowedCommentsRegexp";N;s:20:"HTML.AllowedElements";N;s:19:"HTML.AllowedModules";N;s:23:"HTML.Attr.Name.UseCDATA";b:0;s:17:"HTML.BlockWrapper";s:1:"p";s:16:"HTML.CoreModules";a:7:{s:9:"Structure";b:1;s:4:"Text";b:1;s:9:"Hypertext";b:1;s:4:"List";b:1;s:22:"NonXMLCommonAttributes";b:1;s:19:"XMLCommonAttributes";b:1;s:16:"CommonAttributes";b:1;}s:18:"HTML.CustomDoctype";N;s:17:"HTML.DefinitionID";N;s:18:"HTML.DefinitionRev";i:1;s:12:"HTML.Doctype";N;s:25:"HTML.FlashAllowFullScreen";b:0;s:24:"HTML.ForbiddenAttributes";a:0:{}s:22:"HTML.ForbiddenElements";a:0:{}s:10:"HTML.Forms";b:0;s:17:"HTML.MaxImgLength";N;s:13:"HTML.Nofollow";b:0;s:11:"HTML.Parent";s:3:"div";s:16:"HTML.Proprietary";b:0;s:14:"HTML.SafeEmbed";b:0;s:15:"HTML.SafeIframe";b:0;s:15:"HTML.SafeObject";b:0;s:18:"HTML.SafeScripting";a:0:{}s:11:"HTML.Strict";b:0;s:16:"HTML.TargetBlank";b:0;s:19:"HTML.TargetNoopener";b:1;s:21:"HTML.TargetNoreferrer";b:1;s:12:"HTML.TidyAdd";a:0:{}s:14:"HTML.TidyLevel";s:6:"medium";s:15:"HTML.TidyRemove";a:0:{}s:12:"HTML.Trusted";b:0;s:10:"HTML.XHTML";b:1;s:28:"Output.CommentScriptContents";b:1;s:19:"Output.FixInnerHTML";b:1;s:18:"Output.FlashCompat";b:0;s:14:"Output.Newline";N;s:15:"Output.SortAttr";b:0;s:17:"Output.TidyFormat";b:0;s:17:"Test.ForceNoIconv";b:0;s:18:"URI.AllowedSchemes";a:7:{s:4:"http";b:1;s:5:"https";b:1;s:6:"mailto";b:1;s:3:"ftp";b:1;s:4:"nntp";b:1;s:4:"news";b:1;s:3:"tel";b:1;}s:18:"URI.AllowedSymbols";s:11:"!$&'()*+,;=";s:8:"URI.Base";N;s:17:"URI.DefaultScheme";s:4:"http";s:16:"URI.DefinitionID";N;s:17:"URI.DefinitionRev";i:1;s:11:"URI.Disable";b:0;s:19:"URI.DisableExternal";b:0;s:28:"URI.DisableExternalResources";b:0;s:20:"URI.DisableResources";b:0;s:8:"URI.Host";N;s:17:"URI.HostBlacklist";a:0:{}s:16:"URI.MakeAbsolute";b:0;s:9:"URI.Munge";N;s:18:"URI.MungeResources";b:0;s:18:"URI.MungeSecretKey";N;s:26:"URI.OverrideAllowedSchemes";b:1;s:19:"URI.SafeIframeHosts";N;s:20:"URI.SafeIframeRegexp";N;}s:9:" * parent";N;s:8:" * cache";N;}s:4:"info";a:143:{s:19:"Attr.AllowedClasses";i:-8;s:24:"Attr.AllowedFrameTargets";i:8;s:15:"Attr.AllowedRel";i:8;s:15:"Attr.AllowedRev";i:8;s:18:"Attr.ClassUseCDATA";i:-7;s:20:"Attr.DefaultImageAlt";i:-1;s:24:"Attr.DefaultInvalidImage";i:1;s:27:"Attr.DefaultInvalidImageAlt";i:1;s:19:"Attr.DefaultTextDir";O:8:"stdClass":2:{s:4:"type";i:1;s:7:"allowed";a:2:{s:3:"ltr";b:1;s:3:"rtl";b:1;}}s:13:"Attr.EnableID";i:7;s:17:"HTML.EnableAttrID";O:8:"stdClass":2:{s:3:"key";s:13:"Attr.EnableID";s:7:"isAlias";b:1;}s:21:"Attr.ForbiddenClasses";i:8;s:13:"Attr.ID.HTML5";i:-7;s:16:"Attr.IDBlacklist";i:9;s:22:"Attr.IDBlacklistRegexp";i:-1;s:13:"Attr.IDPrefix";i:1;s:18:"Attr.IDPrefixLocal";i:1;s:24:"AutoFormat.AutoParagraph";i:7;s:17:"AutoFormat.Custom";i:9;s:25:"AutoFormat.DisplayLinkURI";i:7;s:18:"AutoFormat.Linkify";i:7;s:33:"AutoFormat.PurifierLinkify.DocURL";i:1;s:37:"AutoFormatParam.PurifierLinkifyDocURL";O:8:"stdClass":2:{s:3:"key";s:33:"AutoFormat.PurifierLinkify.DocURL";s:7:"isAlias";b:1;}s:26:"AutoFormat.PurifierLinkify";i:7;s:32:"AutoFormat.RemoveEmpty.Predicate";i:10;s:44:"AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions";i:8;s:33:"AutoFormat.RemoveEmpty.RemoveNbsp";i:7;s:22:"AutoFormat.RemoveEmpty";i:7;s:39:"AutoFormat.RemoveSpansWithoutAttributes";i:7;s:19:"CSS.AllowDuplicates";i:7;s:18:"CSS.AllowImportant";i:7;s:15:"CSS.AllowTricky";i:7;s:16:"CSS.AllowedFonts";i:-8;s:21:"CSS.AllowedProperties";i:-8;s:17:"CSS.DefinitionRev";i:5;s:23:"CSS.ForbiddenProperties";i:8;s:16:"CSS.MaxImgLength";i:-1;s:15:"CSS.Proprietary";i:7;s:11:"CSS.Trusted";i:7;s:20:"Cache.DefinitionImpl";i:-1;s:20:"Core.DefinitionCache";O:8:"stdClass":2:{s:3:"key";s:20:"Cache.DefinitionImpl";s:7:"isAlias";b:1;}s:20:"Cache.SerializerPath";i:-1;s:27:"Cache.SerializerPermissions";i:-5;s:22:"Core.AggressivelyFixLt";i:7;s:29:"Core.AggressivelyRemoveScript";i:7;s:28:"Core.AllowHostnameUnderscore";i:7;s:23:"Core.AllowParseManyTags";i:7;s:18:"Core.CollectErrors";i:7;s:18:"Core.ColorKeywords";i:10;s:30:"Core.ConvertDocumentToFragment";i:7;s:24:"Core.AcceptFullDocuments";O:8:"stdClass":2:{s:3:"key";s:30:"Core.ConvertDocumentToFragment";s:7:"isAlias";b:1;}s:36:"Core.DirectLexLineNumberSyncInterval";i:5;s:20:"Core.DisableExcludes";i:7;s:15:"Core.EnableIDNA";i:7;s:13:"Core.Encoding";i:2;s:26:"Core.EscapeInvalidChildren";i:7;s:22:"Core.EscapeInvalidTags";i:7;s:29:"Core.EscapeNonASCIICharacters";i:7;s:19:"Core.HiddenElements";i:8;s:13:"Core.Language";i:1;s:24:"Core.LegacyEntityDecoder";i:7;s:14:"Core.LexerImpl";i:-11;s:24:"Core.MaintainLineNumbers";i:-7;s:22:"Core.NormalizeNewlines";i:7;s:17:"Core.RemoveBlanks";i:7;s:21:"Core.RemoveInvalidImg";i:7;s:33:"Core.RemoveProcessingInstructions";i:7;s:25:"Core.RemoveScriptContents";i:-7;s:13:"Filter.Custom";i:9;s:34:"Filter.ExtractStyleBlocks.Escaping";i:7;s:33:"Filter.ExtractStyleBlocksEscaping";O:8:"stdClass":2:{s:3:"key";s:34:"Filter.ExtractStyleBlocks.Escaping";s:7:"isAlias";b:1;}s:38:"FilterParam.ExtractStyleBlocksEscaping";O:8:"stdClass":2:{s:3:"key";s:34:"Filter.ExtractStyleBlocks.Escaping";s:7:"isAlias";b:1;}s:31:"Filter.ExtractStyleBlocks.Scope";i:-1;s:30:"Filter.ExtractStyleBlocksScope";O:8:"stdClass":2:{s:3:"key";s:31:"Filter.ExtractStyleBlocks.Scope";s:7:"isAlias";b:1;}s:35:"FilterParam.ExtractStyleBlocksScope";O:8:"stdClass":2:{s:3:"key";s:31:"Filter.ExtractStyleBlocks.Scope";s:7:"isAlias";b:1;}s:34:"Filter.ExtractStyleBlocks.TidyImpl";i:-11;s:38:"FilterParam.ExtractStyleBlocksTidyImpl";O:8:"stdClass":2:{s:3:"key";s:34:"Filter.ExtractStyleBlocks.TidyImpl";s:7:"isAlias";b:1;}s:25:"Filter.ExtractStyleBlocks";i:7;s:14:"Filter.YouTube";i:7;s:12:"HTML.Allowed";i:-4;s:22:"HTML.AllowedAttributes";i:-8;s:20:"HTML.AllowedComments";i:8;s:26:"HTML.AllowedCommentsRegexp";i:-1;s:20:"HTML.AllowedElements";i:-8;s:19:"HTML.AllowedModules";i:-8;s:23:"HTML.Attr.Name.UseCDATA";i:7;s:17:"HTML.BlockWrapper";i:1;s:16:"HTML.CoreModules";i:8;s:18:"HTML.CustomDoctype";i:-1;s:17:"HTML.DefinitionID";i:-1;s:18:"HTML.DefinitionRev";i:5;s:12:"HTML.Doctype";O:8:"stdClass":3:{s:4:"type";i:1;s:10:"allow_null";b:1;s:7:"allowed";a:5:{s:22:"HTML 4.01 Transitional";b:1;s:16:"HTML 4.01 Strict";b:1;s:22:"XHTML 1.0 Transitional";b:1;s:16:"XHTML 1.0 Strict";b:1;s:9:"XHTML 1.1";b:1;}}s:25:"HTML.FlashAllowFullScreen";i:7;s:24:"HTML.ForbiddenAttributes";i:8;s:22:"HTML.ForbiddenElements";i:8;s:10:"HTML.Forms";i:7;s:17:"HTML.MaxImgLength";i:-5;s:13:"HTML.Nofollow";i:7;s:11:"HTML.Parent";i:1;s:16:"HTML.Proprietary";i:7;s:14:"HTML.SafeEmbed";i:7;s:15:"HTML.SafeIframe";i:7;s:15:"HTML.SafeObject";i:7;s:18:"HTML.SafeScripting";i:8;s:11:"HTML.Strict";i:7;s:16:"HTML.TargetBlank";i:7;s:19:"HTML.TargetNoopener";i:7;s:21:"HTML.TargetNoreferrer";i:7;s:12:"HTML.TidyAdd";i:8;s:14:"HTML.TidyLevel";O:8:"stdClass":2:{s:4:"type";i:1;s:7:"allowed";a:4:{s:4:"none";b:1;s:5:"light";b:1;s:6:"medium";b:1;s:5:"heavy";b:1;}}s:15:"HTML.TidyRemove";i:8;s:12:"HTML.Trusted";i:7;s:10:"HTML.XHTML";i:7;s:10:"Core.XHTML";O:8:"stdClass":2:{s:3:"key";s:10:"HTML.XHTML";s:7:"isAlias";b:1;}s:28:"Output.CommentScriptContents";i:7;s:26:"Core.CommentScriptContents";O:8:"stdClass":2:{s:3:"key";s:28:"Output.CommentScriptContents";s:7:"isAlias";b:1;}s:19:"Output.FixInnerHTML";i:7;s:18:"Output.FlashCompat";i:7;s:14:"Output.Newline";i:-1;s:15:"Output.SortAttr";i:7;s:17:"Output.TidyFormat";i:7;s:15:"Core.TidyFormat";O:8:"stdClass":2:{s:3:"key";s:17:"Output.TidyFormat";s:7:"isAlias";b:1;}s:17:"Test.ForceNoIconv";i:7;s:18:"URI.AllowedSchemes";i:8;s:18:"URI.AllowedSymbols";i:-1;s:8:"URI.Base";i:-1;s:17:"URI.DefaultScheme";i:-1;s:16:"URI.DefinitionID";i:-1;s:17:"URI.DefinitionRev";i:5;s:11:"URI.Disable";i:7;s:15:"Attr.DisableURI";O:8:"stdClass":2:{s:3:"key";s:11:"URI.Disable";s:7:"isAlias";b:1;}s:19:"URI.DisableExternal";i:7;s:28:"URI.DisableExternalResources";i:7;s:20:"URI.DisableResources";i:7;s:8:"URI.Host";i:-1;s:17:"URI.HostBlacklist";i:9;s:16:"URI.MakeAbsolute";i:7;s:9:"URI.Munge";i:-1;s:18:"URI.MungeResources";i:7;s:18:"URI.MungeSecretKey";i:-1;s:26:"URI.OverrideAllowedSchemes";i:7;s:19:"URI.SafeIframeHosts";i:-8;s:20:"URI.SafeIframeRegexp";i:-1;}}
\ No newline at end of file
diff --git a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
index 2c5924a7a..dc6e30fcb 100644
--- a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
+++ b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
@@ -5,10 +5,10 @@ DEFAULT: ''
--DESCRIPTION--
Temporary prefix for IDs used in conjunction with %Attr.IDPrefix. If you
need to allow multiple sets of user content on web page, you may need to
-have a seperate prefix that changes with each iteration. This way,
-seperately submitted user content displayed on the same page doesn't
+have a separate prefix that changes with each iteration. This way,
+separately submitted user content displayed on the same page doesn't
clobber each other. Ideal values are unique identifiers for the content it
represents (i.e. the id of the row in the database). Be sure to add a
-seperator (like an underscore) at the end. Warning: this directive will
+separator (like an underscore) at the end. Warning: this directive will
not work unless %Attr.IDPrefix is set to a non-empty value!
--# vim: et sw=4 sts=4
diff --git a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
index 7a3291470..63c27303a 100644
--- a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
+++ b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
@@ -1,6 +1,6 @@
CSS.MaxImgLength
TYPE: string/null
-DEFAULT: '1200px'
+DEFAULT: null
VERSION: 3.1.1
--DESCRIPTION--
diff --git a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
index 64b114fce..60cb409f1 100644
--- a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
+++ b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
@@ -7,7 +7,8 @@ This parameter determines whether or not the filter should convert
input that is a full document with html and body tags to a fragment
of just the contents of a body tag. This parameter is simply something
HTML Purifier can do during an edge-case: for most inputs, this
-processing is not necessary.
+processing is not necessary. Warning: Full HTML purification has not
+been implemented. See GitHub issue #7.
--ALIASES--
Core.AcceptFullDocuments
diff --git a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
index abb499948..4eedb3483 100644
--- a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
+++ b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
@@ -8,6 +8,6 @@ converting all non-ASCII characters into decimal numeric entities before
converting it to its native encoding. This means that even characters that
can be expressed in the non-UTF-8 encoding will be entity-ized, which can
be a real downer for encodings like Big5. It also assumes that the ASCII
-repetoire is available, although this is the case for almost all encodings.
+repertoire is available, although this is the case for almost all encodings.
Anyway, use UTF-8!
--# vim: et sw=4 sts=4
diff --git a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
index 8983e2cca..e469b8826 100644
--- a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
+++ b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
@@ -16,7 +16,7 @@ DEFAULT: NULL
string lexer identifier
- This is a slim way of manually overridding the implementation.
+ This is a slim way of manually overriding the implementation.
Currently recognized values are: DOMLex (the default PHP5
implementation)
and DirectLex (the default PHP4 implementation). Only use this if
diff --git a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
index e424c386e..b2591e420 100644
--- a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
+++ b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
@@ -1,6 +1,6 @@
HTML.MaxImgLength
TYPE: int/null
-DEFAULT: 1200
+DEFAULT: null
VERSION: 3.1.1
--DESCRIPTION--
Whether or not to permit iframe tags in untrusted documents. This
directive must be accompanied by a whitelist of permitted iframes,
- such as %URI.SafeIframeRegexp, otherwise it will fatally error.
+ such as %URI.SafeIframeRegexp or %URI.SafeIframeHosts, otherwise it will fatally error.
This directive has no effect on strict doctypes, as iframes are not
valid.
diff --git a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSymbols.txt b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSymbols.txt
new file mode 100644
index 000000000..d89a5f699
--- /dev/null
+++ b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSymbols.txt
@@ -0,0 +1,7 @@
+URI.AllowedSymbols
+TYPE: string/null
+DEFAULT: '!$&\'()*+,;='
+--DESCRIPTION--
+If a system permits templated URLs, then the URI encoder may need extra
+hints about which symbols to preserve.
+--# vim: et sw=4 sts=4
diff --git a/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeHosts.txt b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeHosts.txt
new file mode 100644
index 000000000..c32b52c09
--- /dev/null
+++ b/tools/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeHosts.txt
@@ -0,0 +1,14 @@
+URI.SafeIframeHosts
+TYPE: lookup/null
+DEFAULT: null
+--DESCRIPTION--
+
+ A whitelist which indicates what explicit hosts should be
+ allowed to embed iframe. See also %HTML.SafeIframeRegexp,
+ it has precedence over this config. Here are some example values:
+
+
+
www.youtube.com - Allow YouTube videos
+
maps.google.com - Allow Embedding a Google map
+
+--# vim: et sw=4 sts=4
diff --git a/tools/htmlpurifier/HTMLPurifier/ContentSets.php b/tools/htmlpurifier/HTMLPurifier/ContentSets.php
index 543e3f8f1..d34299522 100644
--- a/tools/htmlpurifier/HTMLPurifier/ContentSets.php
+++ b/tools/htmlpurifier/HTMLPurifier/ContentSets.php
@@ -142,12 +142,11 @@ class HTMLPurifier_ContentSets
if ($return !== false) {
return $return;
}
- // error-out
- trigger_error(
+
+ throw new Exception(
'Could not determine which ChildDef class to instantiate',
E_USER_ERROR
);
- return false;
}
/**
diff --git a/tools/htmlpurifier/HTMLPurifier/Context.php b/tools/htmlpurifier/HTMLPurifier/Context.php
index 00e509c85..5a0e7b91c 100644
--- a/tools/htmlpurifier/HTMLPurifier/Context.php
+++ b/tools/htmlpurifier/HTMLPurifier/Context.php
@@ -24,11 +24,7 @@ class HTMLPurifier_Context
public function register($name, &$ref)
{
if (array_key_exists($name, $this->_storage)) {
- trigger_error(
- "Name $name produces collision, cannot re-register",
- E_USER_ERROR
- );
- return;
+ throw new Exception("Name $name produces collision, cannot re-register");
}
$this->_storage[$name] =& $ref;
}
@@ -43,10 +39,7 @@ class HTMLPurifier_Context
{
if (!array_key_exists($name, $this->_storage)) {
if (!$ignore_error) {
- trigger_error(
- "Attempted to retrieve non-existent variable $name",
- E_USER_ERROR
- );
+ throw new Exception("Attempted to retrieve non-existent variable $name");
}
$var = null; // so we can return by reference
return $var;
@@ -61,11 +54,7 @@ class HTMLPurifier_Context
public function destroy($name)
{
if (!array_key_exists($name, $this->_storage)) {
- trigger_error(
- "Attempted to destroy non-existent variable $name",
- E_USER_ERROR
- );
- return;
+ throw new Exception("Attempted to destroy non-existent variable $name");
}
unset($this->_storage[$name]);
}
diff --git a/tools/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer.php b/tools/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer.php
index bfad967fb..6ba9ad2d9 100644
--- a/tools/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer.php
+++ b/tools/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer.php
@@ -139,8 +139,9 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
continue;
}
$key = substr($filename, 0, strlen($filename) - 4);
- if ($this->isOld($key, $config)) {
- unlink($dir . '/' . $filename);
+ $file = $dir . '/' . $filename;
+ if ($this->isOld($key, $config) && file_exists($file)) {
+ unlink($file);
}
}
closedir($dh);
diff --git a/tools/htmlpurifier/HTMLPurifier/DoctypeRegistry.php b/tools/htmlpurifier/HTMLPurifier/DoctypeRegistry.php
index acc1d64a6..9ad7b4b1e 100644
--- a/tools/htmlpurifier/HTMLPurifier/DoctypeRegistry.php
+++ b/tools/htmlpurifier/HTMLPurifier/DoctypeRegistry.php
@@ -86,7 +86,7 @@ class HTMLPurifier_DoctypeRegistry
$doctype = $this->aliases[$doctype];
}
if (!isset($this->doctypes[$doctype])) {
- trigger_error('Doctype ' . htmlspecialchars($doctype) . ' does not exist', E_USER_ERROR);
+ throw new Exception('Doctype ' . htmlspecialchars($doctype) . ' does not exist');
$anon = new HTMLPurifier_Doctype($doctype);
return $anon;
}
diff --git a/tools/htmlpurifier/HTMLPurifier/Encoder.php b/tools/htmlpurifier/HTMLPurifier/Encoder.php
index d4791cc1b..910181b20 100644
--- a/tools/htmlpurifier/HTMLPurifier/Encoder.php
+++ b/tools/htmlpurifier/HTMLPurifier/Encoder.php
@@ -12,7 +12,7 @@ class HTMLPurifier_Encoder
*/
private function __construct()
{
- trigger_error('Cannot instantiate encoder, call methods statically', E_USER_ERROR);
+ throw new Exception('Cannot instantiate encoder, call methods statically');
}
/**
@@ -390,7 +390,7 @@ class HTMLPurifier_Encoder
$str = self::unsafeIconv($encoding, 'utf-8//IGNORE', $str);
if ($str === false) {
// $encoding is not a valid encoding
- trigger_error('Invalid encoding ' . $encoding, E_USER_ERROR);
+ throw new Exception('Invalid encoding ' . $encoding);
return '';
}
// If the string is bjorked by Shift_JIS or a similar encoding
@@ -404,12 +404,11 @@ class HTMLPurifier_Encoder
}
$bug = HTMLPurifier_Encoder::testIconvTruncateBug();
if ($bug == self::ICONV_OK) {
- trigger_error('Encoding not supported, please install iconv', E_USER_ERROR);
+ throw new Exception('Encoding not supported, please install iconv');
} else {
- trigger_error(
+ throw new Exception(
'You have a buggy version of iconv, see https://bugs.php.net/bug.php?id=48147 ' .
- 'and http://sourceware.org/bugzilla/show_bug.cgi?id=13541',
- E_USER_ERROR
+ 'and http://sourceware.org/bugzilla/show_bug.cgi?id=13541'
);
}
}
@@ -454,7 +453,7 @@ class HTMLPurifier_Encoder
$str = mb_convert_encoding($str, 'ISO-8859-1', 'UTF-8');
return $str;
}
- trigger_error('Encoding not supported', E_USER_ERROR);
+ throw new Exception('Encoding not supported');
// You might be tempted to assume that the ASCII representation
// might be OK, however, this is *not* universally true over all
// encodings. So we take the conservative route here, rather
@@ -545,10 +544,9 @@ class HTMLPurifier_Encoder
} elseif (($c = strlen($r)) < 9000) {
$code = self::ICONV_TRUNCATES;
} elseif ($c > 9000) {
- trigger_error(
+ throw new Exception(
'Your copy of iconv is extremely buggy. Please notify HTML Purifier maintainers: ' .
- 'include your iconv version as per phpversion()',
- E_USER_ERROR
+ 'include your iconv version as per phpversion()'
);
} else {
$code = self::ICONV_OK;
diff --git a/tools/htmlpurifier/HTMLPurifier/EntityParser.php b/tools/htmlpurifier/HTMLPurifier/EntityParser.php
index 0f2b83dc8..1dcd10c7c 100644
--- a/tools/htmlpurifier/HTMLPurifier/EntityParser.php
+++ b/tools/htmlpurifier/HTMLPurifier/EntityParser.php
@@ -5,7 +5,7 @@
// $config or $context to the callback functions.
/**
- * Handles referencing and derefencing character entities
+ * Handles referencing and dereferencing character entities
*/
class HTMLPurifier_EntityParser
{
diff --git a/tools/htmlpurifier/HTMLPurifier/Filter.php b/tools/htmlpurifier/HTMLPurifier/Filter.php
index c1f41ee16..d52ae08dd 100644
--- a/tools/htmlpurifier/HTMLPurifier/Filter.php
+++ b/tools/htmlpurifier/HTMLPurifier/Filter.php
@@ -4,7 +4,7 @@
* Represents a pre or post processing filter on HTML Purifier's output
*
* Sometimes, a little ad-hoc fixing of HTML has to be done before
- * it gets sent through HTML Purifier: you can use filters to acheive
+ * it gets sent through HTML Purifier: you can use filters to achieve
* this effect. For instance, YouTube videos can be preserved using
* this manner. You could have used a decorator for this task, but
* PHP's support for them is not terribly robust, so we're going
diff --git a/tools/htmlpurifier/HTMLPurifier/Filter/YouTube.php b/tools/htmlpurifier/HTMLPurifier/Filter/YouTube.php
index 276d8362f..d86509ced 100644
--- a/tools/htmlpurifier/HTMLPurifier/Filter/YouTube.php
+++ b/tools/htmlpurifier/HTMLPurifier/Filter/YouTube.php
@@ -19,7 +19,7 @@ class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
$pre_regex = '##s';
$pre_replace = '\1';
- return preg_replace($pre_regex, $pre_replace, $html);
+ return preg_replace($pre_regex, $pre_replace, (string)$html);
}
/**
@@ -31,7 +31,7 @@ class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
public function postFilter($html, $config, $context)
{
$post_regex = '#((?:v|cp)/[A-Za-z0-9\-_=]+)#';
- return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);
+ return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), (string)$html);
}
/**
diff --git a/tools/htmlpurifier/HTMLPurifier/Generator.php b/tools/htmlpurifier/HTMLPurifier/Generator.php
index eb56e2dfa..457fa9054 100644
--- a/tools/htmlpurifier/HTMLPurifier/Generator.php
+++ b/tools/htmlpurifier/HTMLPurifier/Generator.php
@@ -244,7 +244,7 @@ class HTMLPurifier_Generator
// whitespace (in fact, most don't, at least for attributes
// like alt, but an extra space at the end is barely
// noticeable). Still, we have a configuration knob for
- // this, since this transformation is not necesary if you
+ // this, since this transformation is not necessary if you
// don't process user input with innerHTML or you don't plan
// on supporting Internet Explorer.
if ($this->_innerHTMLFix) {
diff --git a/tools/htmlpurifier/HTMLPurifier/HTMLDefinition.php b/tools/htmlpurifier/HTMLPurifier/HTMLDefinition.php
index 9b7b334dd..dc2c33c7f 100644
--- a/tools/htmlpurifier/HTMLPurifier/HTMLDefinition.php
+++ b/tools/htmlpurifier/HTMLPurifier/HTMLDefinition.php
@@ -264,9 +264,8 @@ class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
if (isset($this->info_content_sets['Block'][$block_wrapper])) {
$this->info_block_wrapper = $block_wrapper;
} else {
- trigger_error(
- 'Cannot use non-block element as block wrapper',
- E_USER_ERROR
+ throw new Exception(
+ 'Cannot use non-block element as block wrapper'
);
}
@@ -276,11 +275,7 @@ class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
$this->info_parent = $parent;
$this->info_parent_def = $def;
} else {
- trigger_error(
- 'Cannot use unrecognized element as parent',
- E_USER_ERROR
- );
- $this->info_parent_def = $this->manager->getElement($this->info_parent, true);
+ throw new Exception('Cannot use unrecognized element as parent');
}
// support template text
diff --git a/tools/htmlpurifier/HTMLPurifier/HTMLModule/Edit.php b/tools/htmlpurifier/HTMLPurifier/HTMLModule/Edit.php
index a9042a357..f02a563e7 100644
--- a/tools/htmlpurifier/HTMLPurifier/HTMLModule/Edit.php
+++ b/tools/htmlpurifier/HTMLPurifier/HTMLModule/Edit.php
@@ -28,7 +28,7 @@ class HTMLPurifier_HTMLModule_Edit extends HTMLPurifier_HTMLModule
// HTML 4.01 specifies that ins/del must not contain block
// elements when used in an inline context, chameleon is
- // a complicated workaround to acheive this effect
+ // a complicated workaround to achieve this effect
// Inline context ! Block context (exclamation mark is
// separator, see getChildDef for parsing)
diff --git a/tools/htmlpurifier/HTMLPurifier/HTMLModule/Ruby.php b/tools/htmlpurifier/HTMLPurifier/HTMLModule/Ruby.php
index a0d48924d..d1afde0f8 100644
--- a/tools/htmlpurifier/HTMLPurifier/HTMLModule/Ruby.php
+++ b/tools/htmlpurifier/HTMLPurifier/HTMLModule/Ruby.php
@@ -2,7 +2,7 @@
/**
* XHTML 1.1 Ruby Annotation Module, defines elements that indicate
- * short runs of text alongside base text for annotation or pronounciation.
+ * short runs of text alongside base text for annotation or pronunciation.
*/
class HTMLPurifier_HTMLModule_Ruby extends HTMLPurifier_HTMLModule
{
diff --git a/tools/htmlpurifier/HTMLPurifier/HTMLModule/Tidy.php b/tools/htmlpurifier/HTMLPurifier/HTMLModule/Tidy.php
index 76fd93a6c..bd926dc26 100644
--- a/tools/htmlpurifier/HTMLPurifier/HTMLModule/Tidy.php
+++ b/tools/htmlpurifier/HTMLPurifier/HTMLModule/Tidy.php
@@ -112,9 +112,8 @@ class HTMLPurifier_HTMLModule_Tidy extends HTMLPurifier_HTMLModule
return;
}
if (!isset($this->fixesForLevel[$this->defaultLevel])) {
- trigger_error(
- 'Default level ' . $this->defaultLevel . ' does not exist',
- E_USER_ERROR
+ throw new Exception(
+ 'Default level ' . $this->defaultLevel . ' does not exist'
);
return;
}
@@ -162,8 +161,7 @@ class HTMLPurifier_HTMLModule_Tidy extends HTMLPurifier_HTMLModule
$e->$type = $fix;
break;
default:
- trigger_error("Fix type $type not supported", E_USER_ERROR);
- break;
+ throw new Exception("Fix type $type not supported");
}
}
}
diff --git a/tools/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/Name.php b/tools/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/Name.php
index a995161b2..5b3f3d50c 100644
--- a/tools/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/Name.php
+++ b/tools/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/Name.php
@@ -1,7 +1,7 @@
loadLanguage($fallback);
diff --git a/tools/htmlpurifier/HTMLPurifier/Lexer.php b/tools/htmlpurifier/HTMLPurifier/Lexer.php
index fe87fa4ba..793edc89a 100644
--- a/tools/htmlpurifier/HTMLPurifier/Lexer.php
+++ b/tools/htmlpurifier/HTMLPurifier/Lexer.php
@@ -238,7 +238,7 @@ class HTMLPurifier_Lexer
*/
public function tokenizeHTML($string, $config, $context)
{
- trigger_error('Call to abstract class', E_USER_ERROR);
+ throw new Exception('Call to abstract class');
}
/**
diff --git a/tools/htmlpurifier/HTMLPurifier/Lexer/DOMLex.php b/tools/htmlpurifier/HTMLPurifier/Lexer/DOMLex.php
index 7d579837c..de79aaaec 100644
--- a/tools/htmlpurifier/HTMLPurifier/Lexer/DOMLex.php
+++ b/tools/htmlpurifier/HTMLPurifier/Lexer/DOMLex.php
@@ -52,14 +52,7 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
// attempt to armor stray angled brackets that cannot possibly
// form tags and thus are probably being used as emoticons
if ($config->get('Core.AggressivelyFixLt')) {
- $char = '[^a-z!\/]';
- $comment = "/|\z)/is";
- $html = preg_replace_callback($comment, array($this, 'callbackArmorCommentEntities'), $html);
- do {
- $old = $html;
- $html = preg_replace("/<($char)/i", '<\\1', $html);
- } while ($html !== $old);
- $html = preg_replace_callback($comment, array($this, 'callbackUndoCommentSubst'), $html); // fix comments
+ $html = $this->aggressivelyFixLt($html);
}
// preprocess html, essential for UTF-8
@@ -288,7 +281,7 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
*/
public function callbackUndoCommentSubst($matches)
{
- return '';
+
+ while (($startPos = strpos($html, $startTag, $offset)) !== false) {
+ $startPos += strlen($startTag); // Move past `
-
-
-
Example of XHTML + CSS
-
-
Example of paragraph with class selector. Lorem ipsum dolor sit amet, consectetur adipiscing elit. In sed imperdiet lectus. Phasellus quis velit velit, non condimentum quam. Sed neque urna, ultrices ac volutpat vel, laoreet vitae augue. Sed vel velit erat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras eget velit nulla, eu sagittis elit. Nunc ac arcu est, in lobortis tellus. Praesent condimentum rhoncus sodales. In hac habitasse platea dictumst. Proin porta eros pharetra enim tincidunt dignissim nec vel dolor. Cras sapien elit, ornare ac dignissim eu, ultricies ac eros. Maecenas augue magna, ultrices a congue in, mollis eu nulla. Nunc venenatis massa at est eleifend faucibus. Vivamus sed risus lectus, nec interdum nunc.
-
-
Example of paragraph with ID selector. Fusce et felis vitae diam lobortis sollicitudin. Aenean tincidunt accumsan nisi, id vehicula quam laoreet elementum. Phasellus egestas interdum erat, et viverra ipsum ultricies ac. Praesent sagittis augue at augue volutpat eleifend. Cras nec orci neque. Mauris bibendum posuere blandit. Donec feugiat mollis dui sit amet pellentesque. Sed a enim justo. Donec tincidunt, nisl eget elementum aliquam, odio ipsum ultrices quam, eu porttitor ligula urna at lorem. Donec varius, eros et convallis laoreet, ligula tellus consequat felis, ut ornare metus tellus sodales velit. Duis sed diam ante. Ut rutrum malesuada massa, vitae consectetur ipsum rhoncus sed. Suspendisse potenti. Pellentesque a congue massa.
-
-
example of DIV with border and fill.
- Lorem ipsum dolor sit amet, consectetur adipiscing elit.
- text-transform LOWERCASE Lorem ipsum dolor sit amet, consectetur adipiscing elit.
- text-transform uppercase Lorem ipsum dolor sit amet, consectetur adipiscing elit.
- text-transform cAPITALIZE Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-
-Since the CSS margin command is not yet implemented on TCPDF, you need to set the spacing of block tags using the following method.
-
-
SET LINE HEIGHT
-
$pdf->setCellHeightRatio(1.25);
-You can use the following method to fine tune the line height (the number is a percentage relative to font height).
-
-
CHANGE THE PIXEL CONVERSION RATIO
-
$pdf->setImageScale(0.47);
-This is used to adjust the conversion ratio between pixels and document units. Increase the value to get smaller objects.
-Since you are using pixel unit, this method is important to set theright zoom factor.
-Suppose that you want to print a web page larger 1024 pixels to fill all the available page width.
-An A4 page is larger 210mm equivalent to 8.268 inches, if you subtract 13mm (0.512") of margins for each side, the remaining space is 184mm (7.244 inches).
-The default resolution for a PDF document is 300 DPI (dots per inch), so you have 7.244 * 300 = 2173.2 dots (this is the maximum number of points you can print at 300 DPI for the given width).
-The conversion ratio is approximatively 1024 / 2173.2 = 0.47 px/dots
-If the web page is larger 1280 pixels, on the same A4 page the conversion ratio to use is 1280 / 2173.2 = 0.59 pixels/dots';
-
-// output the HTML content
-$pdf->writeHTML($html, true, false, true, false, '');
-
-// reset pointer to the last page
-$pdf->lastPage();
-
-// ---------------------------------------------------------
-
-//Close and output PDF document
-$pdf->Output('example_061.pdf', 'I');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/example_062.php b/tools/tcpdf/examples/example_062.php
deleted file mode 100644
index d0bf89fe9..000000000
--- a/tools/tcpdf/examples/example_062.php
+++ /dev/null
@@ -1,142 +0,0 @@
-setCreator(PDF_CREATOR);
-$pdf->setAuthor('Nicola Asuni');
-$pdf->setTitle('TCPDF Example 062');
-$pdf->setSubject('TCPDF Tutorial');
-$pdf->setKeywords('TCPDF, PDF, example, test, guide');
-
-// set default header data
-$pdf->setHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE.' 062', PDF_HEADER_STRING);
-
-// set header and footer fonts
-$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
-$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
-
-// set default monospaced font
-$pdf->setDefaultMonospacedFont(PDF_FONT_MONOSPACED);
-
-// set margins
-$pdf->setMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-$pdf->setHeaderMargin(PDF_MARGIN_HEADER);
-$pdf->setFooterMargin(PDF_MARGIN_FOOTER);
-
-// set auto page breaks
-$pdf->setAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
-
-// set image scale factor
-$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
-
-// set some language-dependent strings (optional)
-if (@file_exists(dirname(__FILE__).'/lang/eng.php')) {
- require_once(dirname(__FILE__).'/lang/eng.php');
- $pdf->setLanguageArray($l);
-}
-
-// ---------------------------------------------------------
-
-// set font
-$pdf->setFont('helvetica', 'B', 20);
-
-// add a page
-$pdf->AddPage();
-
-$pdf->Write(0, 'XObject Templates', '', 0, 'C', 1, 0, false, false, 0);
-
-/*
- * An XObject Template is a PDF block that is a self-contained
- * description of any sequence of graphics objects (including path
- * objects, text objects, and sampled images).
- * An XObject Template may be painted multiple times, either on
- * several pages or at several locations on the same page and produces
- * the same results each time, subject only to the graphics state at
- * the time it is invoked.
- */
-
-
-// start a new XObject Template and set transparency group option
-$template_id = $pdf->startTemplate(60, 60, true);
-
-// create Template content
-// ...................................................................
-//Start Graphic Transformation
-$pdf->StartTransform();
-
-// set clipping mask
-$pdf->StarPolygon(30, 30, 29, 10, 3, 0, 1, 'CNZ');
-
-// draw jpeg image to be clipped
-$pdf->Image('images/image_demo.jpg', 0, 0, 60, 60, '', '', '', true, 72, '', false, false, 0, false, false, false);
-
-//Stop Graphic Transformation
-$pdf->StopTransform();
-
-$pdf->setXY(0, 0);
-
-$pdf->setFont('times', '', 40);
-
-$pdf->setTextColor(255, 0, 0);
-
-// print a text
-$pdf->Cell(60, 60, 'Template', 0, 0, 'C', false, '', 0, false, 'T', 'M');
-// ...................................................................
-
-// end the current Template
-$pdf->endTemplate();
-
-
-// print the selected Template various times using various transparencies
-
-$pdf->setAlpha(0.4);
-$pdf->printTemplate($template_id, 15, 50, 20, 20, '', '', false);
-
-$pdf->setAlpha(0.6);
-$pdf->printTemplate($template_id, 27, 62, 40, 40, '', '', false);
-
-$pdf->setAlpha(0.8);
-$pdf->printTemplate($template_id, 55, 85, 60, 60, '', '', false);
-
-$pdf->setAlpha(1);
-$pdf->printTemplate($template_id, 95, 125, 80, 80, '', '', false);
-
-// ---------------------------------------------------------
-
-//Close and output PDF document
-$pdf->Output('example_062.pdf', 'I');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/example_063.php b/tools/tcpdf/examples/example_063.php
deleted file mode 100644
index f68f4f90a..000000000
--- a/tools/tcpdf/examples/example_063.php
+++ /dev/null
@@ -1,133 +0,0 @@
-setCreator(PDF_CREATOR);
-$pdf->setAuthor('Nicola Asuni');
-$pdf->setTitle('TCPDF Example 063');
-$pdf->setSubject('TCPDF Tutorial');
-$pdf->setKeywords('TCPDF, PDF, example, test, guide');
-
-// set default header data
-$pdf->setHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE.' 063', PDF_HEADER_STRING);
-
-// set header and footer fonts
-$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
-$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
-
-// set default monospaced font
-$pdf->setDefaultMonospacedFont(PDF_FONT_MONOSPACED);
-
-// set margins
-$pdf->setMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-$pdf->setHeaderMargin(PDF_MARGIN_HEADER);
-$pdf->setFooterMargin(PDF_MARGIN_FOOTER);
-
-// set auto page breaks
-$pdf->setAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
-
-// set image scale factor
-$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
-
-// set some language-dependent strings (optional)
-if (@file_exists(dirname(__FILE__).'/lang/eng.php')) {
- require_once(dirname(__FILE__).'/lang/eng.php');
- $pdf->setLanguageArray($l);
-}
-
-// ---------------------------------------------------------
-
-// set font
-$pdf->setFont('helvetica', 'B', 16);
-
-// add a page
-$pdf->AddPage();
-
-$pdf->Write(0, 'Example of Text Stretching and Spacing (tracking)', '', 0, 'L', true, 0, false, false, 0);
-$pdf->Ln(5);
-
-// create several cells to display all cases of stretching and spacing combinations.
-
-$fonts = array('times', 'dejavuserif');
-$alignments = array('L' => 'LEFT', 'C' => 'CENTER', 'R' => 'RIGHT', 'J' => 'JUSTIFY');
-
-
-// Test all cases using direct stretching/spacing methods
-foreach ($fonts as $fkey => $font) {
- $pdf->setFont($font, '', 14);
- foreach ($alignments as $align_mode => $align_name) {
- for ($stretching = 90; $stretching <= 110; $stretching += 10) {
- for ($spacing = -0.254; $spacing <= 0.254; $spacing += 0.254) {
- $pdf->setFontStretching($stretching);
- $pdf->setFontSpacing($spacing);
- $txt = $align_name.' | Stretching = '.$stretching.'% | Spacing = '.sprintf('%+.3F', $spacing).'mm';
- $pdf->Cell(0, 0, $txt, 1, 1, $align_mode);
- }
- }
- }
- $pdf->AddPage();
-}
-
-
-// Test all cases using CSS stretching/spacing properties
-foreach ($fonts as $fkey => $font) {
- $pdf->setFont($font, '', 11);
- foreach ($alignments as $align_mode => $align_name) {
- for ($stretching = 90; $stretching <= 110; $stretching += 10) {
- for ($spacing = -0.254; $spacing <= 0.254; $spacing += 0.254) {
- $html = ''.$align_name.' | Stretching = '.$stretching.'% | Spacing = '.sprintf('%+.3F', $spacing).'mm Lorem ipsum dolor sit amet, consectetur adipiscing elit. In sed imperdiet lectus. Phasellus quis velit velit, non condimentum quam. Sed neque urna, ultrices ac volutpat vel, laoreet vitae augue. Sed vel velit erat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.';
- $pdf->writeHTMLCell(0, 0, '', '', $html, 1, 1, false, true, $align_mode, false);
- }
- }
- if (!(($fkey == 1) AND ($align_mode == 'J'))) {
- $pdf->AddPage();
- }
- }
-}
-
-
-// reset font stretching
-$pdf->setFontStretching(100);
-
-// reset font spacing
-$pdf->setFontSpacing(0);
-
-// ---------------------------------------------------------
-
-//Close and output PDF document
-$pdf->Output('example_063.pdf', 'I');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/example_064.php b/tools/tcpdf/examples/example_064.php
deleted file mode 100644
index 8efaf4fea..000000000
--- a/tools/tcpdf/examples/example_064.php
+++ /dev/null
@@ -1,178 +0,0 @@
-setCreator(PDF_CREATOR);
-$pdf->setAuthor('Nicola Asuni');
-$pdf->setTitle('TCPDF Example 064');
-$pdf->setSubject('TCPDF Tutorial');
-$pdf->setKeywords('TCPDF, PDF, example, test, guide');
-
-// set default header data
-$pdf->setHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE.' 064', PDF_HEADER_STRING);
-
-// set header and footer fonts
-$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
-$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
-
-// set default monospaced font
-$pdf->setDefaultMonospacedFont(PDF_FONT_MONOSPACED);
-
-// set margins
-$pdf->setMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-$pdf->setHeaderMargin(PDF_MARGIN_HEADER);
-$pdf->setFooterMargin(PDF_MARGIN_FOOTER);
-
-// set auto page breaks
-$pdf->setAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
-
-// set image scale factor
-$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
-
-// set some language-dependent strings (optional)
-if (@file_exists(dirname(__FILE__).'/lang/eng.php')) {
- require_once(dirname(__FILE__).'/lang/eng.php');
- $pdf->setLanguageArray($l);
-}
-
-// ---------------------------------------------------------
-
-// set font
-$pdf->setFont('helvetica', '', 8);
-
-
-// define some html content for testing
-$txt = '
TEST PAGE REGIONS:A no-write region is a portion of the page with a rectangular or trapezium shape that will not be covered when writing text or html code. A region is always aligned on the left or right side of the page ad is defined using a vertical segment. You can set multiple regions for the same page. You can combine several adjacent regions to approximate curved shapes. Lorem ipsum dolor sit amet, consectetur adipiscing elit. In sed imperdiet lectus. Phasellus quis velit velit, non condimentum quam. Sed neque urna, ultrices ac volutpat vel, laoreet vitae augue. Sed vel velit erat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras eget velit nulla, eu sagittis elit. Nunc ac arcu est, in lobortis tellus. Praesent condimentum rhoncus sodales. In hac habitasse platea dictumst. Proin porta eros pharetra enim tincidunt dignissim nec vel dolor. Cras sapien elit, ornare ac dignissim eu, ultricies ac eros. Maecenas augue magna, ultrices a congue in, mollis eu nulla. Nunc venenatis massa at est eleifend faucibus. Vivamus sed risus lectus, nec interdum nunc.
-Fusce et felis vitae diam lobortis sollicitudin. Aenean tincidunt accumsan nisi, id vehicula quam laoreet elementum. Phasellus egestas interdum erat, et viverra ipsum ultricies ac. Praesent sagittis augue at augue volutpat eleifend. Cras nec orci neque. Mauris bibendum posuere blandit. Donec feugiat mollis dui sit amet pellentesque. Sed a enim justo. Donec tincidunt, nisl eget elementum aliquam, odio ipsum ultrices quam, eu porttitor ligula urna at lorem. Donec varius, eros et convallis laoreet, ligula tellus consequat felis, ut ornare metus tellus sodales velit. Duis sed diam ante. Ut rutrum malesuada massa, vitae consectetur ipsum rhoncus sed. Suspendisse potenti. Pellentesque a congue massa.
-Integer non sem eget neque mattis accumsan. Maecenas eu nisl mauris, sit amet interdum ipsum. In pharetra erat vel lectus venenatis elementum. Nulla non elit ligula, sit amet mollis urna. Morbi ut gravida est. Mauris tincidunt sem et turpis molestie malesuada. Curabitur vel nulla risus, sed mollis erat. Suspendisse vehicula accumsan purus nec varius. Donec fermentum lorem id felis sodales dictum. Quisque et dolor ipsum. Nam luctus consectetur dui vitae fermentum. Curabitur sodales consequat augue, id ultricies augue tempor ac. Aliquam ac magna id ipsum vehicula bibendum. Sed elementum congue tristique. Phasellus vel lorem eu lectus porta sodales. Etiam neque tortor, sagittis id pharetra quis, laoreet vel arcu.
-Cras quam mi, ornare laoreet laoreet vel, vehicula at lacus. Maecenas a lacus accumsan augue convallis sagittis sed quis odio. Morbi sit amet turpis diam, dictum convallis urna. Cras eget interdum augue. Cras eu nisi sit amet dolor faucibus porttitor. Suspendisse potenti. Nunc vitae dolor risus, at cursus libero. Suspendisse bibendum tellus non nibh hendrerit tristique. Mauris eget orci elit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam porta libero non ante laoreet semper. Proin volutpat sodales mi, ac fermentum erat sagittis in. Vivamus at viverra felis. Ut pretium facilisis ante et pharetra.
-Nulla facilisi. Cras varius quam eget libero aliquam vitae tincidunt leo rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque a nisl massa, quis pretium urna. Proin vel porttitor tortor. Cras rhoncus congue velit in bibendum. Donec pharetra semper augue id lacinia. Quisque magna quam, hendrerit eu aliquam et, pellentesque ut tellus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas nulla quam, rutrum eu feugiat at, elementum eu libero. Maecenas ullamcorper leo et turpis rutrum ac laoreet eros faucibus. Phasellus condimentum lorem quis neque imperdiet quis molestie enim iaculis. Phasellus risus est, vestibulum ut convallis ultrices, dignissim nec erat. Etiam congue lobortis laoreet. Nulla ut neque sed velit dapibus semper. Quisque nec dolor id nibh eleifend iaculis. Vivamus vitae fermentum odio. Etiam malesuada quam in nulla aliquam sed convallis dui feugiat.
';
-
-
-// add a page
-$pdf->AddPage();
-
-// print some graphic content
-$pdf->Image('images/image_demo.jpg', 155, 30, 40, 40, 'JPG', '', '', true);
-$pdf->Image('images/image_demo.jpg', 15, 230, 40, 40, 'JPG', '', '', true);
-
-// define some graphic styles
-$styleA = array('width' => 0.254, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(255, 0, 0));
-$styleB = array('width' => 0.254, 'cap' => 'butt', 'join' => 'miter', 'dash' => 3, 'color' => array(127, 127, 127));
-$pdf->setFillColor(220, 255, 220);
-
-// write a trapezoid with some information about no-write page regions
-$pdf->Polygon(array(15,90, 57,90, 67,140, 15,140), 'DF', array($styleB, $styleA, $styleB, $styleB));
-$pdf->setXY(15, 90);
-$pdf->Cell(42, 0, 'xt,yt', 0, 0, 'R', false, '', 0, false, 'T', 'T');
-$pdf->setXY(15, 140);
-$pdf->Cell(52, 0, 'xb,yb', 0, 0, 'R', false, '', 0, false, 'B', 'B');
-$pdf->setXY(15, 115);
-$pdf->Cell(40, 0, 'side', 0, 0, 'R', false, '', 0, false, 'B', 'B');
-$pdf->setLineStyle(array('width' => 0.254, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)));
-$pdf->Arrow(60, 115, 35, 115, 2, 5, 15);
-
-// write a trapezoid with some information about no-write page regions
-$pdf->Polygon(array(145,130, 195,130, 195,180, 155,180), 'DF', array($styleB, $styleB, $styleB, $styleA));
-$pdf->setXY(145, 130);
-$pdf->Cell(42, 0, 'xt,yt', 0, 0, 'L', false, '', 0, false, 'T', 'T');
-$pdf->setXY(155, 180);
-$pdf->Cell(52, 0, 'xb,yb', 0, 0, 'L', false, '', 0, false, 'B', 'B');
-$pdf->setXY(160, 155);
-$pdf->Cell(30, 0, 'side', 0, 0, 'L', false, '', 0, false, 'B', 'B');
-$pdf->setLineStyle(array('width' => 0.254, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)));
-$pdf->Arrow(155, 155, 180, 155, 2, 5, 15);
-
-// reset x,y position
-$pdf->setXY(15, 30);
-
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-// define no-write page regions to avoid text overlapping images
-/*
- 'page' => page number or empy for current page
- 'xt' => X top
- 'yt' => Y top
- 'yb' => Y bottom
- 'side' => page side ('L' = left or 'R' = right)
-*/
-$regions = array(
-array('page' => '', 'xt' => 153, 'yt' => 30, 'xb' => 153, 'yb' => 70, 'side' => 'R'),
-array('page' => '', 'xt' => 60, 'yt' => 90, 'xb' => 70, 'yb' => 140, 'side' => 'L'),
-array('page' => '', 'xt' => 143, 'yt' => 130, 'xb' => 153, 'yb' => 180, 'side' => 'R'),
-array('page' => '', 'xt' => 58, 'yt' => 230, 'xb' => 58, 'yb' => 270, 'side' => 'L')
-);
-
-// set page regions, check also getPageRegions(), addPageRegion() and removePageRegion()
-$pdf->setPageRegions($regions);
-
-// write html text
-$pdf->writeHTML($txt, true, false, true, false, '');
-
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-// set a circular no-write region on the second page
-$regions = array(
-array('page' => 2, 'xt' => 195, 'yt' => 110, 'xb' => 179.693, 'yb' => 113.045, 'side' => 'R'),
-array('page' => 2, 'xt' => 179.693, 'yt' => 113.045, 'xb' => 166.716, 'yb' => 121.716, 'side' => 'R'),
-array('page' => 2, 'xt' => 166.716, 'yt' => 121.716, 'xb' => 158.045, 'yb' => 134.693, 'side' => 'R'),
-array('page' => 2, 'xt' => 158.045, 'yt' => 134.693, 'xb' => 155, 'yb' => 150, 'side' => 'R'),
-array('page' => 2, 'xt' => 155, 'yt' => 150, 'xb' => 158.045, 'yb' => 165.307, 'side' => 'R'),
-array('page' => 2, 'xt' => 158.045, 'yt' => 165.307, 'xb' => 166.716, 'yb' => 178.284, 'side' => 'R'),
-array('page' => 2, 'xt' => 166.716, 'yt' => 178.284, 'xb' => 179.693, 'yb' => 186.955, 'side' => 'R'),
-array('page' => 2, 'xt' => 179.693, 'yt' => 186.955, 'xb' => 195, 'yb' => 190, 'side' => 'R')
-);
-$pdf->setPageRegions($regions);
-
-$pdf->Polygon(array(195,110, 179.693,113.045, 166.716,121.716, 158.045,134.693, 155,150, 158.045,165.307, 166.716,178.284, 179.693,186.955, 195,190), 'DF');
-
-$pdf->Ln(15);
-
-// define some html content for testing
-$txt = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. In sed imperdiet lectus. Phasellus quis velit velit, non condimentum quam. Sed neque urna, ultrices ac volutpat vel, laoreet vitae augue. Sed vel velit erat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras eget velit nulla, eu sagittis elit. Nunc ac arcu est, in lobortis tellus. Praesent condimentum rhoncus sodales. In hac habitasse platea dictumst. Proin porta eros pharetra enim tincidunt dignissim nec vel dolor. Cras sapien elit, ornare ac dignissim eu, ultricies ac eros. Maecenas augue magna, ultrices a congue in, mollis eu nulla. Nunc venenatis massa at est eleifend faucibus. Vivamus sed risus lectus, nec interdum nunc. Fusce et felis vitae diam lobortis sollicitudin. Aenean tincidunt accumsan nisi, id vehicula quam laoreet elementum. Phasellus egestas interdum erat, et viverra ipsum ultricies ac. Praesent sagittis augue at augue volutpat eleifend. Cras nec orci neque. Mauris bibendum posuere blandit. Donec feugiat mollis dui sit amet pellentesque. Sed a enim justo. Donec tincidunt, nisl eget elementum aliquam, odio ipsum ultrices quam, eu porttitor ligula urna at lorem. Donec varius, eros et convallis laoreet, ligula tellus consequat felis, ut ornare metus tellus sodales velit. Duis sed diam ante. Ut rutrum malesuada massa, vitae consectetur ipsum rhoncus sed. Suspendisse potenti. Pellentesque a congue massa. Integer non sem eget neque mattis accumsan. Maecenas eu nisl mauris, sit amet interdum ipsum. In pharetra erat vel lectus venenatis elementum. Nulla non elit ligula, sit amet mollis urna. Morbi ut gravida est. Mauris tincidunt sem et turpis molestie malesuada. Curabitur vel nulla risus, sed mollis erat. Suspendisse vehicula accumsan purus nec varius. Donec fermentum lorem id felis sodales dictum. Quisque et dolor ipsum. Nam luctus consectetur dui vitae fermentum. Curabitur sodales consequat augue, id ultricies augue tempor ac. Aliquam ac magna id ipsum vehicula bibendum. Sed elementum congue tristique. Phasellus vel lorem eu lectus porta sodales. Etiam neque tortor, sagittis id pharetra quis, laoreet vel arcu. Cras quam mi, ornare laoreet laoreet vel, vehicula at lacus. Maecenas a lacus accumsan augue convallis sagittis sed quis odio. Morbi sit amet turpis diam, dictum convallis urna. Cras eget interdum augue. Cras eu nisi sit amet dolor faucibus porttitor. Suspendisse potenti. Nunc vitae dolor risus, at cursus libero. Suspendisse bibendum tellus non nibh hendrerit tristique. Mauris eget orci elit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam porta libero non ante laoreet semper. Proin volutpat sodales mi, ac fermentum erat sagittis in. Vivamus at viverra felis. Ut pretium facilisis ante et pharetra. Nulla facilisi. Cras varius quam eget libero aliquam vitae tincidunt leo rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque a nisl massa, quis pretium urna. Proin vel porttitor tortor. Cras rhoncus congue velit in bibendum. Donec pharetra semper augue id lacinia. Quisque magna quam, hendrerit eu aliquam et, pellentesque ut tellus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas nulla quam, rutrum eu feugiat at, elementum eu libero. Maecenas ullamcorper leo et turpis rutrum ac laoreet eros faucibus. Phasellus condimentum lorem quis neque imperdiet quis molestie enim iaculis. Phasellus risus est, vestibulum ut convallis ultrices, dignissim nec erat. Etiam congue lobortis laoreet. Nulla ut neque sed velit dapibus semper. Quisque nec dolor id nibh eleifend iaculis. Vivamus vitae fermentum odio. Etiam malesuada quam in nulla aliquam sed convallis dui feugiat.'."\n";
-
-// write text
-$pdf->MultiCell(0, 0, $txt, 0, 'J', false, 1, '', '', true, 0, false, true, 0, 'T', false);
-
-// ---------------------------------------------------------
-
-//Close and output PDF document
-$pdf->Output('example_064.pdf', 'I');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/example_065.php b/tools/tcpdf/examples/example_065.php
deleted file mode 100644
index 90794804c..000000000
--- a/tools/tcpdf/examples/example_065.php
+++ /dev/null
@@ -1,100 +0,0 @@
-setCreator(PDF_CREATOR);
-$pdf->setAuthor('Nicola Asuni');
-$pdf->setTitle('TCPDF Example 065');
-$pdf->setSubject('TCPDF Tutorial');
-$pdf->setKeywords('TCPDF, PDF, example, test, guide');
-
-// set default header data
-$pdf->setHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE.' 065', PDF_HEADER_STRING);
-
-// set header and footer fonts
-$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
-$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
-
-// set default monospaced font
-$pdf->setDefaultMonospacedFont(PDF_FONT_MONOSPACED);
-
-// set margins
-$pdf->setMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-$pdf->setHeaderMargin(PDF_MARGIN_HEADER);
-$pdf->setFooterMargin(PDF_MARGIN_FOOTER);
-
-// set auto page breaks
-$pdf->setAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
-
-// set image scale factor
-$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
-
-// set some language-dependent strings (optional)
-if (@file_exists(dirname(__FILE__).'/lang/eng.php')) {
- require_once(dirname(__FILE__).'/lang/eng.php');
- $pdf->setLanguageArray($l);
-}
-
-// ---------------------------------------------------------
-
-// set default font subsetting mode
-$pdf->setFontSubsetting(true);
-
-// Set font
-$pdf->setFont('helvetica', '', 14, '', true);
-
-// Add a page
-// This method has several options, check the source code documentation for more information.
-$pdf->AddPage();
-
-// Set some content to print
-$html = <<Example of TCPDF document in PDF/A-1b mode.
-This document conforms to the standard PDF/A-1b (ISO 19005-1:2005).
-
Please check the source code documentation and other examples for further information (http://www.tcpdf.org).
-
TO IMPROVE AND EXPAND TCPDF I NEED YOUR SUPPORT, PLEASE MAKE A DONATION!
-EOD;
-
-// Print text using writeHTMLCell()
-$pdf->writeHTMLCell(0, 0, '', '', $html, 0, 1, 0, true, '', true);
-
-// ---------------------------------------------------------
-
-// Close and output PDF document
-// This method has several options, check the source code documentation for more information.
-$pdf->Output('example_065.pdf', 'I');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/example_066.php b/tools/tcpdf/examples/example_066.php
deleted file mode 100644
index 41b8b4729..000000000
--- a/tools/tcpdf/examples/example_066.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- * @license LGPL-3.0
- */
-
-/**
- * Creates an example PDF/A-1b document using TCPDF
- *
- * @abstract TCPDF - Example: PDF/A-1b mode
- * @author Nicola Asuni
- * @since 2021-03-26
- * @group A-1b
- * @group pdf
- */
-
-// Include the main TCPDF library (search for installation path).
-require_once('tcpdf_include.php');
-
-// create new PDF document
-$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false, true);
-
-// set document information
-$pdf->setCreator(PDF_CREATOR);
-$pdf->setAuthor('Nicola Asuni');
-$pdf->setTitle('TCPDF Example 066');
-$pdf->setSubject('TCPDF Tutorial');
-$pdf->setKeywords('TCPDF, PDF, example, test, guide');
-
-// set default header data
-$pdf->setHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE . ' 066', PDF_HEADER_STRING);
-
-// set header and footer fonts
-$pdf->setHeaderFont(array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
-$pdf->setFooterFont(array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
-
-// set default monospaced font
-$pdf->setDefaultMonospacedFont(PDF_FONT_MONOSPACED);
-
-// set margins
-$pdf->setMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-$pdf->setHeaderMargin(PDF_MARGIN_HEADER);
-$pdf->setFooterMargin(PDF_MARGIN_FOOTER);
-
-// set auto page breaks
-$pdf->setAutoPageBreak(true, PDF_MARGIN_BOTTOM);
-
-// set image scale factor
-$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
-
-// set some language-dependent strings (optional)
-if (@file_exists(__DIR__ . '/lang/eng.php')) {
- require_once __DIR__ . '/lang/eng.php';
-
- $pdf->setLanguageArray($l);
-}
-
-// ---------------------------------------------------------
-
-// set default font subsetting mode
-$pdf->setFontSubsetting(true);
-
-// Set font
-$pdf->setFont('helvetica', '', 14, '', true);
-
-// Add a page
-// This method has several options, check the source code documentation for more information.
-$pdf->AddPage();
-
-// Set some content to print
-$html = <<Example of TCPDF document in PDF/A-1b mode.
-This document conforms to the standard PDF/A-1b (ISO 19005-1:2005).
-
Please check the source code documentation and other examples for further information (http://www.tcpdf.org).
-HTML;
-
-// Print text using writeHTMLCell()
-$pdf->writeHTMLCell(0, 0, '', '', $html, 0, 1, 0, true, '', true);
-
-// ---------------------------------------------------------
-
-// Close and output PDF document
-// This method has several options, check the source code documentation for more information.
-$pdf->Output('example_066.pdf', 'I');
diff --git a/tools/tcpdf/examples/example_067.php b/tools/tcpdf/examples/example_067.php
deleted file mode 100644
index e0262bfde..000000000
--- a/tools/tcpdf/examples/example_067.php
+++ /dev/null
@@ -1,223 +0,0 @@
-setCreator(PDF_CREATOR);
-$pdf->setAuthor('Owen Leibman');
-$pdf->setTitle('TCPDF Example 067');
-$pdf->setSubject('TCPDF Tutorial');
-$pdf->setKeywords('TCPDF, PDF, example, test, guide');
-
-// set default header data
-$pdf->setHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE.' 067', PDF_HEADER_STRING);
-
-// set header and footer fonts
-$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
-$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
-
-// set default monospaced font
-$pdf->setDefaultMonospacedFont(PDF_FONT_MONOSPACED);
-
-// set margins
-$pdf->setMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-$pdf->setHeaderMargin(PDF_MARGIN_HEADER);
-$pdf->setFooterMargin(PDF_MARGIN_FOOTER);
-
-// set auto page breaks
-$pdf->setAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
-
-// set image scale factor
-$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
-
-// set some language-dependent strings (optional)
-if (@file_exists(dirname(__FILE__).'/lang/eng.php')) {
- require_once(dirname(__FILE__).'/lang/eng.php');
- $pdf->setLanguageArray($l);
-}
-
-// ---------------------------------------------------------
-
-// set font
-$pdf->setFont('helvetica', 'B', 20);
-
-// add a page
-$pdf->AddPage();
-
-$pdf->Write(0, 'Example of HTML tables', '', 0, 'L', true, 0, false, false, 0);
-
-$pdf->setFont('helvetica', '', 8);
-
-// -----------------------------------------------------------------------------
-
-$tbl = <<
-
-
COL 1 - ROW 1 COLSPAN 3
-
COL 2 - ROW 1
-
COL 3 - ROW 1
-
-
-
COL 2 - ROW 2 - COLSPAN 2 text line text line text line text line
COL 2 - ROW 2 - COLSPAN 2 text line text line text line text line
-
COL 3 - ROW 2
-
-
-
COL 3 - ROW 3
-
-
-
-EOD;
-
-$pdf->writeHTML($tbl, true, false, false, false, '');
-
-// -----------------------------------------------------------------------------
-
-// At medium thickness, which is what you get with only one
-// setting for style, everything looks the same.
-// Included just for completeness.
-$tbl = <<
-
-
COL 1 - ROW 1 COLSPAN 3
-
COL 2 - ROW 1
-
COL 3 - ROW 1
-
-
-
COL 2 - ROW 2 - COLSPAN 2 text line text line text line text line
-
COL 3 - ROW 2
-
-
-
COL 3 - ROW 3
-
-
-
-EOD;
-
-$pdf->writeHTML($tbl, true, false, false, false, '');
-// -----------------------------------------------------------------------------
-
-//Close and output PDF document
-$pdf->Output('example_067.pdf', 'I');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/images/_blank.png b/tools/tcpdf/examples/images/_blank.png
deleted file mode 100644
index 38f7b2fa5..000000000
Binary files a/tools/tcpdf/examples/images/_blank.png and /dev/null differ
diff --git a/tools/tcpdf/examples/images/alpha.png b/tools/tcpdf/examples/images/alpha.png
deleted file mode 100644
index 4980117de..000000000
Binary files a/tools/tcpdf/examples/images/alpha.png and /dev/null differ
diff --git a/tools/tcpdf/examples/images/image_demo.jpg b/tools/tcpdf/examples/images/image_demo.jpg
deleted file mode 100644
index 262bce272..000000000
Binary files a/tools/tcpdf/examples/images/image_demo.jpg and /dev/null differ
diff --git a/tools/tcpdf/examples/images/image_with_alpha.png b/tools/tcpdf/examples/images/image_with_alpha.png
deleted file mode 100644
index f87dc9a1b..000000000
Binary files a/tools/tcpdf/examples/images/image_with_alpha.png and /dev/null differ
diff --git a/tools/tcpdf/examples/images/img.png b/tools/tcpdf/examples/images/img.png
deleted file mode 100644
index 2461637e3..000000000
Binary files a/tools/tcpdf/examples/images/img.png and /dev/null differ
diff --git a/tools/tcpdf/examples/images/logo_example.gif b/tools/tcpdf/examples/images/logo_example.gif
deleted file mode 100644
index 010b487d9..000000000
Binary files a/tools/tcpdf/examples/images/logo_example.gif and /dev/null differ
diff --git a/tools/tcpdf/examples/images/logo_example.jpg b/tools/tcpdf/examples/images/logo_example.jpg
deleted file mode 100644
index 6d9b8fd80..000000000
Binary files a/tools/tcpdf/examples/images/logo_example.jpg and /dev/null differ
diff --git a/tools/tcpdf/examples/images/logo_example.png b/tools/tcpdf/examples/images/logo_example.png
deleted file mode 100644
index a57be4ce9..000000000
Binary files a/tools/tcpdf/examples/images/logo_example.png and /dev/null differ
diff --git a/tools/tcpdf/examples/images/tcpdf_box.ai b/tools/tcpdf/examples/images/tcpdf_box.ai
deleted file mode 100644
index 0c1484614..000000000
--- a/tools/tcpdf/examples/images/tcpdf_box.ai
+++ /dev/null
@@ -1,214 +0,0 @@
-%!PS-Adobe-3.0 EPSF
-%%Creator: Adobe Illustrator
-%%BoundingBox: -7 0 487 327
-%%HiResBoundingBox: -6.66162 2.44007e-05 486.662 326.648
-%AI5_FileFormat 3
-%%EndComments
-%%BeginProlog
-%%EndProlog
-%%BeginSetup
-%%EndSetup
-1 XR
-%AI5_BeginLayer
-1 1 1 1 0 0 -1 49 80 161 Lb
-(New Layer) Ln
-0.620000 0.580000 0.435000 0.996000 K
-[] 0 d
-1.402287 w
-0 j
-0 J
-0.263000 0.290000 0.898000 0.263000 k
-72.7885 255.643 m
-277.08 286.778 L
-425.478 260.993 L
-408.269 190.301 L
-113.504 181.247 L
-113.504 181.247 72.9813 241.769 72.7885 255.643 C
-b
-0.620000 0.580000 0.435000 0.996000 K
-1 j
-0.094000 0.102000 0.369000 0.016000 k
-423.247 259.914 m
-240.217 207.097 L
-240.635 0.701168 L
-397.776 116.053 L
-423.247 259.914 L
-b
-0.620000 0.580000 0.435000 0.996000 K
-0.133000 0.141000 0.541000 0.035000 k
-72.1745 254.207 m
-240.217 207.097 L
-240.561 0.783816 L
-101.054 87.946 L
-72.1745 254.207 L
-b
-0.047000 0.059000 0.184000 0.004000 k
-423.247 259.914 m
-308.187 51.1553 L
-396.862 116.972 L
-423.247 259.914 L
-f
-0.620000 0.580000 0.435000 0.996000 K
-0 j
-0.047000 0.059000 0.184000 0.004000 k
-479.312 250.415 m
-423.613 260.243 L
-240.385 206.966 L
-314.061 186.394 L
-479.312 250.415 L
-b
-0.620000 0.580000 0.435000 0.996000 K
-0.047000 0.059000 0.184000 0.004000 k
-69.9121 254.273 m
-237.965 207.131 L
-163.618 164.537 L
-0.687544 234.686 L
-69.9121 254.273 L
-b
-0.620000 0.580000 0.435000 0.996000 K
-0.047000 0.059000 0.184000 0.004000 k
-242.971 319.299 m
-275.613 286.233 L
-72.5703 254.295 L
-16.555 296.161 L
-242.971 319.299 L
-b
-0.620000 0.580000 0.435000 0.996000 K
-0.133000 0.141000 0.541000 0.035000 k
-423.496 260.684 m
-275.426 286.441 L
-307.326 316.69 L
-462.053 292.606 L
-423.496 260.684 L
-b
-0.196000 0.227000 0.871000 0.106000 k
-75.26 254.037 m
-274.806 285.371 L
-227.928 211.257 L
-163.396 228.836 130.937 238.701 75.26 254.037 C
-f
-0.620000 0.580000 0.435000 0.996000 K
-1 j
-0.169000 0.314000 0.424000 0.094000 k
-275.528 286.329 m
-274.75 216.78 L
-275.528 286.329 L
-b
-0.031000 0.949000 0.745000 0.729000 k
-285.929 160.982 m
-285.929 160.982 285.078 139.734 285.078 139.734 C
-285.078 139.734 275.378 135.096 275.378 135.096 C
-275.378 135.096 273.058 57.6061 273.058 57.6061 C
-273.058 57.6061 257.133 47.3536 257.133 47.3536 C
-257.133 47.3536 258.059 126.816 258.059 126.816 C
-258.059 126.816 247.186 121.618 247.186 121.618 C
-247.186 121.618 247.186 144.26 247.186 144.26 C
-247.186 144.26 285.929 160.982 285.929 160.982 C
-F
-0.031000 0.949000 0.745000 0.729000 k
-320.884 135.342 m
-320.884 135.342 307.279 128.129 307.279 128.129 C
-307.279 128.129 308.36 144.944 308.36 144.944 C
-308.681 149.948 308.724 153.011 308.483 154.097 C
-308.268 155.24 307.632 155.567 306.572 155.073 C
-305.368 154.512 304.553 153.381 304.135 151.687 C
-303.718 149.995 303.36 146.608 303.063 141.565 C
-303.063 141.565 300.477 97.6864 300.477 97.6864 C
-300.22 93.3298 300.208 90.6032 300.439 89.4791 C
-300.668 88.3599 301.318 88.1316 302.385 88.7881 C
-303.403 89.4149 304.103 90.4684 304.487 91.9528 C
-304.894 93.4524 305.253 96.6211 305.567 101.497 C
-305.567 101.497 306.297 112.86 306.297 112.86 C
-306.297 112.86 319.718 120.438 319.718 120.438 C
-319.718 120.438 319.446 116.964 319.446 116.964 C
-318.734 107.862 317.873 101.293 316.856 97.1389 C
-315.864 93.0164 314.026 88.8059 311.329 84.474 C
-308.636 80.1307 305.421 76.743 301.646 74.2975 C
-297.651 71.7096 294.365 70.7251 291.812 71.3887 C
-289.213 72.064 287.545 74.2699 286.838 78.0362 C
-286.121 81.8925 285.954 88.3297 286.349 97.4441 C
-286.349 97.4441 287.575 125.751 287.575 125.751 C
-287.89 133.007 288.277 138.586 288.737 142.421 C
-289.202 146.323 290.251 150.369 291.883 154.544 C
-293.54 158.732 295.716 162.4 298.394 165.529 C
-301.078 168.689 304.052 170.959 307.296 172.342 C
-311.621 174.188 315.02 174.154 317.521 172.296 C
-319.974 170.473 321.427 167.541 321.911 163.514 C
-322.39 159.578 322.275 153.119 321.579 144.225 C
-321.579 144.225 320.884 135.342 320.884 135.342 C
-F
-0.031000 0.949000 0.745000 0.729000 k
-*u
-329.084 179.607 m
-329.084 179.607 342.074 185.214 342.074 185.214 C
-345.446 186.669 347.94 187.235 349.586 186.932 C
-351.233 186.642 352.374 185.695 353.019 184.1 C
-353.677 182.527 353.999 180.418 353.991 177.777 C
-354.005 175.2 353.703 171.072 353.088 165.429 C
-353.088 165.429 352.244 157.683 352.244 157.683 C
-351.634 152.084 350.908 147.89 350.063 145.056 C
-349.22 142.228 347.957 139.718 346.265 137.514 C
-344.583 135.308 342.474 133.487 339.919 132.046 C
-339.919 132.046 336.736 130.25 336.736 130.25 C
-336.736 130.25 333.512 96.527 333.512 96.527 C
-333.512 96.527 321.545 88.8222 321.545 88.8222 C
-321.545 88.8222 329.084 179.607 329.084 179.607 C
-F
-340.42 168.795 m
-340.42 168.795 338.184 145.407 338.184 145.407 C
-338.526 145.552 338.82 145.69 339.068 145.822 C
-340.172 146.404 340.98 147.319 341.498 148.568 C
-342.038 149.863 342.473 152.174 342.805 155.518 C
-342.805 155.518 343.55 163.014 343.55 163.014 C
-343.863 166.167 343.82 168.111 343.416 168.832 C
-343.011 169.557 342.015 169.547 340.42 168.795 C
-F
-*U
-0.031000 0.949000 0.745000 0.729000 k
-*u
-359.204 192.607 m
-359.204 192.607 367.556 196.212 367.556 196.212 C
-372.753 198.454 376.114 199.414 377.734 199.14 C
-379.351 198.877 380.446 197.777 381.03 195.854 C
-381.608 193.948 381.815 191.642 381.655 188.934 C
-381.502 186.28 380.88 180.934 379.804 172.981 C
-379.804 172.981 375.968 144.653 375.968 144.653 C
-375.021 137.654 374.236 132.926 373.604 130.399 C
-372.993 127.921 372.216 125.786 371.268 123.986 C
-370.323 122.215 369.243 120.698 368.023 119.43 C
-366.801 118.187 365.012 116.807 362.638 115.279 C
-362.638 115.279 349.593 106.88 349.593 106.88 C
-349.593 106.88 359.204 192.607 359.204 192.607 C
-F
-368.395 181.985 m
-368.395 181.985 361.644 126.918 361.644 126.918 C
-363.113 127.815 364.084 128.947 364.566 130.32 C
-365.053 131.727 365.629 135.077 366.301 140.416 C
-366.301 140.416 370.368 172.752 370.368 172.752 C
-370.86 176.666 371.12 179.163 371.145 180.223 C
-371.168 181.285 371.006 181.972 370.654 182.282 C
-370.306 182.629 369.555 182.531 368.395 181.985 C
-F
-*U
-0.031000 0.949000 0.745000 0.729000 k
-387.58 204.854 m
-387.58 204.854 403.348 211.659 403.348 211.659 C
-403.348 211.659 400.803 195.062 400.803 195.062 C
-400.803 195.062 394.579 192.087 394.579 192.087 C
-394.579 192.087 392.296 176.619 392.296 176.619 C
-392.296 176.619 397.801 179.482 397.801 179.482 C
-397.801 179.482 395.533 164.634 395.533 164.634 C
-395.533 164.634 390.075 161.574 390.075 161.574 C
-390.075 161.574 385.406 129.937 385.406 129.937 C
-385.406 129.937 376.374 124.122 376.374 124.122 C
-376.374 124.122 387.58 204.854 387.58 204.854 C
-F
-LB
-%AI5_EndLayer--
-%AI5_BeginLayer
-1 1 1 1 0 0 -1 49 80 161 Lb
-(MasterLayer 1) Ln
-LB
-%AI5_EndLayer--
-%%Trailer
-%%EOF
diff --git a/tools/tcpdf/examples/images/tcpdf_box.svg b/tools/tcpdf/examples/images/tcpdf_box.svg
deleted file mode 100644
index 8c29e64ab..000000000
--- a/tools/tcpdf/examples/images/tcpdf_box.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tools/tcpdf/examples/images/tcpdf_cell.png b/tools/tcpdf/examples/images/tcpdf_cell.png
deleted file mode 100644
index 2e3e92ccb..000000000
Binary files a/tools/tcpdf/examples/images/tcpdf_cell.png and /dev/null differ
diff --git a/tools/tcpdf/examples/images/tcpdf_logo.jpg b/tools/tcpdf/examples/images/tcpdf_logo.jpg
deleted file mode 100644
index 257f8fb6d..000000000
Binary files a/tools/tcpdf/examples/images/tcpdf_logo.jpg and /dev/null differ
diff --git a/tools/tcpdf/examples/images/tcpdf_signature.png b/tools/tcpdf/examples/images/tcpdf_signature.png
deleted file mode 100644
index 64caa51fe..000000000
Binary files a/tools/tcpdf/examples/images/tcpdf_signature.png and /dev/null differ
diff --git a/tools/tcpdf/examples/images/testsvg.svg b/tools/tcpdf/examples/images/testsvg.svg
deleted file mode 100644
index fd8314e34..000000000
--- a/tools/tcpdf/examples/images/testsvg.svg
+++ /dev/null
@@ -1,328 +0,0 @@
-
-
-
-
- TCPDF SVG EXAMPLE
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- www.tcpdf.org
-
-
-
-
-
-
-
- SVG
-
diff --git a/tools/tcpdf/examples/images/tux.svg b/tools/tcpdf/examples/images/tux.svg
deleted file mode 100644
index de8c86968..000000000
--- a/tools/tcpdf/examples/images/tux.svg
+++ /dev/null
@@ -1,1487 +0,0 @@
-
-
-
-
-
- image/svg+xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tools/tcpdf/examples/index.php b/tools/tcpdf/examples/index.php
deleted file mode 100644
index d865689b1..000000000
--- a/tools/tcpdf/examples/index.php
+++ /dev/null
@@ -1,117 +0,0 @@
-';
-?>
-
-
-
-
-
-TCPDF Examples
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tools/tcpdf/examples/lang/afr.php b/tools/tcpdf/examples/lang/afr.php
deleted file mode 100644
index 367b7e87f..000000000
--- a/tools/tcpdf/examples/lang/afr.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
+ Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ along with this program. If not, see .
Also add information on how to contact you by electronic and paper mail.
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
-.
+.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
-.
+.
diff --git a/tools/tcpdf/fonts/freefont-20100919/CREDITS b/tools/tcpdf/fonts/freefont-20100919/CREDITS
index 0b69784b5..e4a8b634e 100644
--- a/tools/tcpdf/fonts/freefont-20100919/CREDITS
+++ b/tools/tcpdf/fonts/freefont-20100919/CREDITS
@@ -331,7 +331,7 @@ a set of TTF fonts for nine Indian scripts (Devanagari, Gujarati,
Telugu, Tamil, Malayalam, Kannada, Bengali, Oriya, and Gurumukhi)
under the GNU General Public License (GPL). You can download the fonts
from the Free Software Foundation of India WWW site
-(http://www.gnu.org.in/akruti-fonts/) or from the Akruti website.
+(https://www.gnu.org.in/akruti-fonts/) or from the Akruti website.
For any further information or assistance regarding these fonts,
please contact mssridhar AT vsnl.com.
diff --git a/tools/tcpdf/fonts/freefont-20120503/COPYING b/tools/tcpdf/fonts/freefont-20120503/COPYING
index 94a9ed024..ae0725d80 100644
--- a/tools/tcpdf/fonts/freefont-20120503/COPYING
+++ b/tools/tcpdf/fonts/freefont-20120503/COPYING
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ along with this program. If not, see .
Also add information on how to contact you by electronic and paper mail.
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
-.
+.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
-.
+.
diff --git a/tools/tcpdf/fonts/freefont-20120503/CREDITS b/tools/tcpdf/fonts/freefont-20120503/CREDITS
index f4430ecf9..bc078aacc 100644
--- a/tools/tcpdf/fonts/freefont-20120503/CREDITS
+++ b/tools/tcpdf/fonts/freefont-20120503/CREDITS
@@ -336,7 +336,7 @@ a set of TTF fonts for nine Indian scripts (Devanagari, Gujarati,
Telugu, Tamil, Malayalam, Kannada, Bengali, Oriya, and Gurumukhi)
under the GNU General Public License (GPL). You can download the fonts
from the Free Software Foundation of India WWW site
-(http://www.gnu.org.in/akruti-fonts/) or from the Akruti website.
+(https://www.gnu.org.in/akruti-fonts/) or from the Akruti website.
For any further information or assistance regarding these fonts,
please contact mssridhar AT vsnl.com.
diff --git a/tools/tcpdf/fonts/freefont-20120503/README b/tools/tcpdf/fonts/freefont-20120503/README
index d83f4a945..daf679e67 100644
--- a/tools/tcpdf/fonts/freefont-20120503/README
+++ b/tools/tcpdf/fonts/freefont-20120503/README
@@ -30,7 +30,7 @@ FreeFont covers the following character ranges
* geometrical shapes, box drawing
* musical symbols, gaming symbols, miscellaneous symbols
etc.
-For more detail see
+For more detail see
Editing
-------
@@ -108,7 +108,7 @@ Further information
-------------------
Home page of GNU FreeFont:
- http://www.gnu.org/software/freefont/
+ https://www.gnu.org/software/freefont/
More information is at the main project page of Free UCS scalable fonts:
http://savannah.gnu.org/projects/freefont/
diff --git a/tools/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING b/tools/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING
index a7af22255..0639198ac 100644
--- a/tools/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING
+++ b/tools/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING
@@ -27,7 +27,7 @@ a different font.
First double-check that the font in question really contains the character
in question. If you don't have font development software, this can be
tricky. In the case of FreeFont, you can check if a given character
-range is supported:
+range is supported:
Next double-check that your application (web browser, text editor, etc)
has indeed been properly instructed to use the font.
diff --git a/tools/tcpdf/include/barcodes/datamatrix.php b/tools/tcpdf/include/barcodes/datamatrix.php
index d1cc6d2a9..77822fdf1 100644
--- a/tools/tcpdf/include/barcodes/datamatrix.php
+++ b/tools/tcpdf/include/barcodes/datamatrix.php
@@ -5,9 +5,9 @@
// Begin : 2010-06-07
// Last Update : 2014-05-06
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
+// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
-// Copyright (C) 2010-2014 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2010-2014 2026 Nicola Asuni - Tecnick.com LTD
//
// This file is part of TCPDF software library.
//
@@ -22,7 +22,7 @@
// See the GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF. If not, see .
+// along with TCPDF. If not, see .
//
// See LICENSE.TXT file for more information.
// -------------------------------------------------------------------
diff --git a/tools/tcpdf/include/barcodes/pdf417.php b/tools/tcpdf/include/barcodes/pdf417.php
index bda24822f..4c9a4b3d1 100644
--- a/tools/tcpdf/include/barcodes/pdf417.php
+++ b/tools/tcpdf/include/barcodes/pdf417.php
@@ -5,9 +5,9 @@
// Begin : 2010-06-03
// Last Update : 2014-04-25
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
+// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
-// Copyright (C) 2010-2013 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2010-2013 2026 Nicola Asuni - Tecnick.com LTD
//
// This file is part of TCPDF software library.
//
@@ -22,7 +22,7 @@
// See the GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF. If not, see .
+// along with TCPDF. If not, see .
//
// See LICENSE.TXT file for more information.
// -------------------------------------------------------------------
diff --git a/tools/tcpdf/include/barcodes/qrcode.php b/tools/tcpdf/include/barcodes/qrcode.php
index 1a64a4cb5..72cbf15e8 100644
--- a/tools/tcpdf/include/barcodes/qrcode.php
+++ b/tools/tcpdf/include/barcodes/qrcode.php
@@ -5,9 +5,9 @@
// Begin : 2010-03-22
// Last Update : 2012-07-25
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
+// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
-// Copyright (C) 2010-2012 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2010-2026 Nicola Asuni - Tecnick.com LTD
//
// This file is part of TCPDF software library.
//
@@ -22,7 +22,7 @@
// See the GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF. If not, see .
+// along with TCPDF. If not, see .
//
// See LICENSE.TXT file for more information.
// -------------------------------------------------------------------
diff --git a/tools/tcpdf/include/tcpdf_colors.php b/tools/tcpdf/include/tcpdf_colors.php
index 5a51594c3..fc5aeb08f 100644
--- a/tools/tcpdf/include/tcpdf_colors.php
+++ b/tools/tcpdf/include/tcpdf_colors.php
@@ -5,9 +5,9 @@
// Begin : 2002-04-09
// Last Update : 2014-04-25
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
+// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
-// Copyright (C) 2002-2013 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2002-2013 2026 Nicola Asuni - Tecnick.com LTD
//
// This file is part of TCPDF software library.
//
@@ -22,7 +22,7 @@
// See the GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF. If not, see .
+// along with TCPDF. If not, see .
//
// See LICENSE.TXT file for more information.
// -------------------------------------------------------------------
@@ -275,7 +275,7 @@ class TCPDF_COLORS {
$color = strtolower($color);
// check for javascript color array syntax
if (strpos($color, '[') !== false) {
- if (preg_match('/[\[][\"\'](t|g|rgb|cmyk)[\"\'][\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\]]/', $color, $m) > 0) {
+ if (preg_match('/[\[][\"\'](t|g|rgba|rgb|cmyk)[\"\'][\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\]]/', $color, $m) > 0) {
$returncolor = array();
switch ($m[1]) {
case 'cmyk': {
@@ -286,7 +286,8 @@ class TCPDF_COLORS {
$returncolor['K'] = max(0, min(100, (floatval($m[5]) * 100)));
break;
}
- case 'rgb': {
+ case 'rgb':
+ case 'rgba': {
// RGB
$returncolor['R'] = max(0, min(255, (floatval($m[2]) * 255)));
$returncolor['G'] = max(0, min(255, (floatval($m[3]) * 255)));
@@ -317,6 +318,25 @@ class TCPDF_COLORS {
if (strlen($color) == 0) {
return $defcol;
}
+ // RGBA ARRAY
+ if (substr($color, 0, 4) == 'rgba') {
+ $codes = substr($color, 5);
+ $codes = str_replace(')', '', $codes);
+ $returncolor = explode(',', $codes);
+ // remove alpha component
+ array_pop($returncolor);
+ foreach ($returncolor as $key => $val) {
+ if (strpos($val, '%') > 0) {
+ // percentage
+ $returncolor[$key] = (255 * intval($val) / 100);
+ } else {
+ $returncolor[$key] = intval($val); /* floatize */
+ }
+ // normalize value
+ $returncolor[$key] = max(0, min(255, $returncolor[$key]));
+ }
+ return $returncolor;
+ }
// RGB ARRAY
if (substr($color, 0, 3) == 'rgb') {
$codes = substr($color, 4);
diff --git a/tools/tcpdf/include/tcpdf_filters.php b/tools/tcpdf/include/tcpdf_filters.php
index 3009cff7c..96be66f5d 100644
--- a/tools/tcpdf/include/tcpdf_filters.php
+++ b/tools/tcpdf/include/tcpdf_filters.php
@@ -5,9 +5,9 @@
// Begin : 2011-05-23
// Last Update : 2014-04-25
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
+// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
-// Copyright (C) 2011-2013 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2011-2026 Nicola Asuni - Tecnick.com LTD
//
// This file is part of TCPDF software library.
//
diff --git a/tools/tcpdf/include/tcpdf_font_data.php b/tools/tcpdf/include/tcpdf_font_data.php
index 974e72ec7..d7eae2f30 100644
--- a/tools/tcpdf/include/tcpdf_font_data.php
+++ b/tools/tcpdf/include/tcpdf_font_data.php
@@ -5,9 +5,9 @@
// Begin : 2008-01-01
// Last Update : 2013-04-01
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
+// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
-// Copyright (C) 2008-2013 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2008-2026 Nicola Asuni - Tecnick.com LTD
//
// This file is part of TCPDF software library.
//
@@ -22,7 +22,7 @@
// See the GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF. If not, see .
+// along with TCPDF. If not, see .
//
// See LICENSE.TXT file for more information.
// -------------------------------------------------------------------
diff --git a/tools/tcpdf/include/tcpdf_fonts.php b/tools/tcpdf/include/tcpdf_fonts.php
index f4518d9ef..1fc24f5af 100644
--- a/tools/tcpdf/include/tcpdf_fonts.php
+++ b/tools/tcpdf/include/tcpdf_fonts.php
@@ -1,13 +1,13 @@
.
+// along with TCPDF. If not, see .
//
// See LICENSE.TXT file for more information.
// -------------------------------------------------------------------
@@ -42,7 +42,7 @@
* @class TCPDF_FONTS
* Font methods for TCPDF library.
* @package com.tecnick.tcpdf
- * @version 1.1.0
+ * @version 1.1.1
* @author Nicola Asuni - info@tecnick.com
*/
class TCPDF_FONTS {
@@ -191,29 +191,30 @@ class TCPDF_FONTS {
fclose($fp);
// get font info
$fmetric['Flags'] = $flags;
- preg_match ('#/FullName[\s]*\(([^\)]*)#', $font, $matches);
+ preg_match ('#/FullName[\s]*+\(([^\)]*+)#', $font, $matches);
$fmetric['name'] = preg_replace('/[^a-zA-Z0-9_\-]/', '', $matches[1]);
- preg_match('#/FontBBox[\s]*{([^}]*)#', $font, $matches);
- $fmetric['bbox'] = trim($matches[1]);
- $bv = explode(' ', $fmetric['bbox']);
- $fmetric['Ascent'] = intval($bv[3]);
- $fmetric['Descent'] = intval($bv[1]);
- preg_match('#/ItalicAngle[\s]*([0-9\+\-]*)#', $font, $matches);
+ preg_match('#/FontBBox[\s]*+{([^}]*+)#', $font, $matches);
+ $rawbvl = explode(' ', trim($matches[1]));
+ $bvl = [(int) $rawbvl[0], (int) $rawbvl[1], (int) $rawbvl[2], (int) $rawbvl[3]];
+ $fmetric['bbox'] = implode(' ', $bvl);
+ $fmetric['Ascent'] = $bvl[3];
+ $fmetric['Descent'] = $bvl[1];
+ preg_match('#/ItalicAngle[\s]*+([0-9\+\-]*+)#', $font, $matches);
$fmetric['italicAngle'] = intval($matches[1]);
if ($fmetric['italicAngle'] != 0) {
$fmetric['Flags'] |= 64;
}
- preg_match('#/UnderlinePosition[\s]*([0-9\+\-]*)#', $font, $matches);
+ preg_match('#/UnderlinePosition[\s]*+([0-9\+\-]*+)#', $font, $matches);
$fmetric['underlinePosition'] = intval($matches[1]);
- preg_match('#/UnderlineThickness[\s]*([0-9\+\-]*)#', $font, $matches);
+ preg_match('#/UnderlineThickness[\s]*+([0-9\+\-]*+)#', $font, $matches);
$fmetric['underlineThickness'] = intval($matches[1]);
- preg_match('#/isFixedPitch[\s]*([^\s]*)#', $font, $matches);
+ preg_match('#/isFixedPitch[\s]*+([^\s]*+)#', $font, $matches);
if ($matches[1] == 'true') {
$fmetric['Flags'] |= 1;
}
// get internal map
$imap = array();
- if (preg_match_all('#dup[\s]([0-9]+)[\s]*/([^\s]*)[\s]put#sU', $font, $fmap, PREG_SET_ORDER) > 0) {
+ if (preg_match_all('#dup[\s]([0-9]+)[\s]*+/([^\s]*+)[\s]put#sU', $font, $fmap, PREG_SET_ORDER) > 0) {
foreach ($fmap as $v) {
$imap[$v[2]] = $v[1];
}
@@ -229,22 +230,22 @@ class TCPDF_FONTS {
$eplain .= chr($chr ^ ($r >> 8));
$r = ((($chr + $r) * $c1 + $c2) % 65536);
}
- if (preg_match('#/ForceBold[\s]*([^\s]*)#', $eplain, $matches) > 0) {
+ if (preg_match('#/ForceBold[\s]*+([^\s]*+)#', $eplain, $matches) > 0) {
if ($matches[1] == 'true') {
$fmetric['Flags'] |= 0x40000;
}
}
- if (preg_match('#/StdVW[\s]*\[([^\]]*)#', $eplain, $matches) > 0) {
+ if (preg_match('#/StdVW[\s]*+\[([^\]]*+)#', $eplain, $matches) > 0) {
$fmetric['StemV'] = intval($matches[1]);
} else {
$fmetric['StemV'] = 70;
}
- if (preg_match('#/StdHW[\s]*\[([^\]]*)#', $eplain, $matches) > 0) {
+ if (preg_match('#/StdHW[\s]*+\[([^\]]*+)#', $eplain, $matches) > 0) {
$fmetric['StemH'] = intval($matches[1]);
} else {
$fmetric['StemH'] = 30;
}
- if (preg_match('#/BlueValues[\s]*\[([^\]]*)#', $eplain, $matches) > 0) {
+ if (preg_match('#/BlueValues[\s]*+\[([^\]]*+)#', $eplain, $matches) > 0) {
$bv = explode(' ', $matches[1]);
if (count($bv) >= 6) {
$v1 = intval($bv[2]);
@@ -265,7 +266,7 @@ class TCPDF_FONTS {
$fmetric['CapHeight'] = 700;
}
// get the number of random bytes at the beginning of charstrings
- if (preg_match('#/lenIV[\s]*([0-9]*)#', $eplain, $matches) > 0) {
+ if (preg_match('#/lenIV[\s]*+([\d]*+)#', $eplain, $matches) > 0) {
$lenIV = intval($matches[1]);
} else {
$lenIV = 4;
@@ -273,7 +274,7 @@ class TCPDF_FONTS {
$fmetric['Leading'] = 0;
// get charstring data
$eplain = substr($eplain, (strpos($eplain, '/CharStrings') + 1));
- preg_match_all('#/([A-Za-z0-9\.]*)[\s][0-9]+[\s]RD[\s](.*)[\s]ND#sU', $eplain, $matches, PREG_SET_ORDER);
+ preg_match_all('#/([A-Za-z0-9\.]*+)[\s][0-9]+[\s]RD[\s](.*)[\s]ND#sU', $eplain, $matches, PREG_SET_ORDER);
if (!empty($enc) AND isset(TCPDF_FONT_DATA::$encmap[$enc])) {
$enc_map = TCPDF_FONT_DATA::$encmap[$enc];
} else {
@@ -1383,7 +1384,7 @@ class TCPDF_FONTS {
}
// set checkSumAdjustment on head table
$checkSumAdjustment = 0xB1B0AFBA - self::_getTTFtableChecksum($font, strlen($font));
- $font = substr($font, 0, $table['head']['offset'] + $offset + 8).pack('N', $checkSumAdjustment).substr($font, $table['head']['offset'] + $offset + 12);
+ $font = substr($font, 0, $table['head']['offset'] + $offset + 4).pack('N', $checkSumAdjustment).substr($font, $table['head']['offset'] + $offset + 8);
return $font;
}
diff --git a/tools/tcpdf/include/tcpdf_images.php b/tools/tcpdf/include/tcpdf_images.php
index 6f2860c60..2d8b96e62 100644
--- a/tools/tcpdf/include/tcpdf_images.php
+++ b/tools/tcpdf/include/tcpdf_images.php
@@ -5,9 +5,9 @@
// Begin : 2002-08-03
// Last Update : 2014-11-15
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
+// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
-// Copyright (C) 2002-2014 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2002-2026 Nicola Asuni - Tecnick.com LTD
//
// This file is part of TCPDF software library.
//
@@ -126,7 +126,9 @@ class TCPDF_IMAGES {
// create temporary PNG image
imagepng($image, $tempfile);
// remove image from memory
- imagedestroy($image);
+ if (PHP_VERSION_ID < 80000) {
+ imagedestroy($image);
+ }
// get PNG image data
$retvars = self::_parsepng($tempfile);
// tidy up by removing temporary image
@@ -145,7 +147,9 @@ class TCPDF_IMAGES {
*/
public static function _toJPEG($image, $quality, $tempfile) {
imagejpeg($image, $tempfile, $quality);
- imagedestroy($image);
+ if (PHP_VERSION_ID < 80000) {
+ imagedestroy($image);
+ }
$retvars = self::_parsejpeg($tempfile);
// tidy up by removing temporary image
unlink($tempfile);
@@ -270,12 +274,12 @@ class TCPDF_IMAGES {
return 'pngalpha';
}
if (ord(fread($f, 1)) != 0) {
- // Unknown compression method
+ // Unknownn compression method
fclose($f);
return false;
}
if (ord(fread($f, 1)) != 0) {
- // Unknown filter method
+ // Unknownn filter method
fclose($f);
return false;
}
@@ -327,7 +331,7 @@ class TCPDF_IMAGES {
}
// get compression method
if (ord(fread($f, 1)) != 0) {
- // Unknown filter method
+ // Unknownn filter method
fclose($f);
return false;
}
diff --git a/tools/tcpdf/include/tcpdf_static.php b/tools/tcpdf/include/tcpdf_static.php
index 16828944c..86dbad577 100644
--- a/tools/tcpdf/include/tcpdf_static.php
+++ b/tools/tcpdf/include/tcpdf_static.php
@@ -1,13 +1,13 @@
* @package com.tecnick.tcpdf
* @author Nicola Asuni
- * @version 1.1.2
+ * @version 1.1.5
*/
/**
@@ -46,7 +46,7 @@
* Static methods used by the TCPDF class.
* @package com.tecnick.tcpdf
* @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 1.1.1
+ * @version 1.1.5
* @author Nicola Asuni - info@tecnick.com
*/
class TCPDF_STATIC {
@@ -55,7 +55,7 @@ class TCPDF_STATIC {
* Current TCPDF version.
* @private static
*/
- private static $tcpdf_version = '6.7.8';
+ private static $tcpdf_version = '6.11.3';
/**
* String alias for total number of pages.
@@ -106,6 +106,31 @@ class TCPDF_STATIC {
*/
public static $pageboxes = array('MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox');
+ /**
+ * Array of default cURL options for curl_setopt_array.
+ *
+ * @var array cURL options.
+ */
+ protected const CURLOPT_DEFAULT = [
+ CURLOPT_CONNECTTIMEOUT => 5,
+ CURLOPT_MAXREDIRS => 5,
+ CURLOPT_PROTOCOLS => CURLPROTO_HTTPS | CURLPROTO_HTTP | CURLPROTO_FTP | CURLPROTO_FTPS,
+ CURLOPT_SSL_VERIFYHOST => 2,
+ CURLOPT_SSL_VERIFYPEER => true,
+ CURLOPT_TIMEOUT => 30,
+ CURLOPT_USERAGENT => 'tcpdf',
+ ];
+
+ /**
+ * Array of fixed cURL options for curl_setopt_array.
+ *
+ * @var array cURL options.
+ */
+ protected const CURLOPT_FIXED = [
+ CURLOPT_FAILONERROR => true,
+ CURLOPT_RETURNTRANSFER => true,
+ ];
+
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/**
@@ -467,7 +492,7 @@ class TCPDF_STATIC {
* @param string $last_enc_key_c Reference to last RC4 computed key.
* @return string encrypted text
* @since 2.0.000 (2008-01-02)
- * @author Klemen Vodopivec, Nicola Asuni
+ * @author Klemen Vodopivec,2026 Nicola Asuni
* @public static
*/
public static function _RC4($key, $text, &$last_enc_key, &$last_enc_key_c) {
@@ -1823,26 +1848,24 @@ class TCPDF_STATIC {
*/
public static function url_exists($url) {
$crs = curl_init();
- // encode query params in URL to get right response form the server
- $url = self::encodeUrlQuery($url);
- curl_setopt($crs, CURLOPT_URL, $url);
- curl_setopt($crs, CURLOPT_NOBODY, true);
- curl_setopt($crs, CURLOPT_FAILONERROR, true);
- if ((ini_get('open_basedir') == '') && (!ini_get('safe_mode'))) {
- curl_setopt($crs, CURLOPT_FOLLOWLOCATION, true);
- }
- curl_setopt($crs, CURLOPT_CONNECTTIMEOUT, 5);
- curl_setopt($crs, CURLOPT_TIMEOUT, 30);
- curl_setopt($crs, CURLOPT_SSL_VERIFYPEER, false);
- curl_setopt($crs, CURLOPT_SSL_VERIFYHOST, false);
- curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
- curl_setopt($crs, CURLOPT_MAXREDIRS, 5);
- if (defined('CURLOPT_PROTOCOLS')) {
- curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP | CURLPROTO_FTP | CURLPROTO_FTPS);
- }
+ $curlopts = [];
+ if (
+ (ini_get('open_basedir') == '')
+ && (ini_get('safe_mode') === ''
+ || ini_get('safe_mode') === false)
+ ) {
+ $curlopts[CURLOPT_FOLLOWLOCATION] = true;
+ }
+ $curlopts = array_replace($curlopts, self::CURLOPT_DEFAULT);
+ $curlopts = array_replace($curlopts, K_CURLOPTS);
+ $curlopts = array_replace($curlopts, self::CURLOPT_FIXED);
+ $curlopts[CURLOPT_URL] = $url;
+ curl_setopt_array($crs, $curlopts);
curl_exec($crs);
$code = curl_getinfo($crs, CURLINFO_HTTP_CODE);
- curl_close($crs);
+ if (PHP_VERSION_ID < 80000) {
+ curl_close($crs);
+ }
return ($code == 200);
}
@@ -1960,23 +1983,23 @@ class TCPDF_STATIC {
) {
// try to get remote file data using cURL
$crs = curl_init();
- curl_setopt($crs, CURLOPT_URL, $path);
- curl_setopt($crs, CURLOPT_FAILONERROR, true);
- curl_setopt($crs, CURLOPT_RETURNTRANSFER, true);
- if ((ini_get('open_basedir') == '') && (!ini_get('safe_mode'))) {
- curl_setopt($crs, CURLOPT_FOLLOWLOCATION, true);
- }
- curl_setopt($crs, CURLOPT_CONNECTTIMEOUT, 5);
- curl_setopt($crs, CURLOPT_TIMEOUT, 30);
- curl_setopt($crs, CURLOPT_SSL_VERIFYPEER, false);
- curl_setopt($crs, CURLOPT_SSL_VERIFYHOST, false);
- curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
- curl_setopt($crs, CURLOPT_MAXREDIRS, 5);
- if (defined('CURLOPT_PROTOCOLS')) {
- curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP | CURLPROTO_FTP | CURLPROTO_FTPS);
+ $curlopts = [];
+ if (
+ (ini_get('open_basedir') == '')
+ && (ini_get('safe_mode') === ''
+ || ini_get('safe_mode') === false)
+ ) {
+ $curlopts[CURLOPT_FOLLOWLOCATION] = true;
}
+ $curlopts = array_replace($curlopts, self::CURLOPT_DEFAULT);
+ $curlopts = array_replace($curlopts, K_CURLOPTS);
+ $curlopts = array_replace($curlopts, self::CURLOPT_FIXED);
+ $curlopts[CURLOPT_URL] = $url;
+ curl_setopt_array($crs, $curlopts);
$ret = curl_exec($crs);
- curl_close($crs);
+ if (PHP_VERSION_ID < 80000) {
+ curl_close($crs);
+ }
if ($ret !== false) {
return $ret;
}
@@ -2633,7 +2656,6 @@ class TCPDF_STATIC {
return $page_mode;
}
-
} // END OF TCPDF_STATIC CLASS
//============================================================+
diff --git a/tools/tcpdf/tcpdf.php b/tools/tcpdf/tcpdf.php
index 3404c52b3..b369532dc 100644
--- a/tools/tcpdf/tcpdf.php
+++ b/tools/tcpdf/tcpdf.php
@@ -1,13 +1,13 @@
* @package com.tecnick.tcpdf
* @author Nicola Asuni
- * @version 6.7.8
+ * @version 6.11.3
*/
// TCPDF configuration
@@ -128,7 +128,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.php');
* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.
* @package com.tecnick.tcpdf
* @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 6.7.8
+ * @version 6.11.3
* @author Nicola Asuni - info@tecnick.com
* @IgnoreAnnotation("protected")
* @IgnoreAnnotation("public")
@@ -1131,7 +1131,7 @@ class TCPDF {
protected $opencell = true;
/**
- * Array of files to embedd.
+ * Array of files to embed.
* @protected
* @since 4.4.000 (2008-12-07)
*/
@@ -1810,6 +1810,13 @@ class TCPDF {
*/
protected $custom_xmp_rdf = '';
+ /**
+ * Custom XMP RDF pdfaextension data.
+ * @protected
+ * @since 6.9.0 (2025-02-11)
+ */
+ protected $custom_xmp_rdf_pdfaExtension = '';
+
/**
* Overprint mode array.
* (Check the "Entries in a Graphics State Parameter Dictionary" on PDF 32000-1:2008).
@@ -2900,14 +2907,7 @@ class TCPDF {
* @since 1.4
*/
public function setCompression($compress=true) {
- $this->compress = false;
- if (function_exists('gzcompress')) {
- if ($compress) {
- if ( !$this->pdfa_mode) {
- $this->compress = true;
- }
- }
- }
+ $this->compress = ($compress && function_exists('gzcompress'));
}
/**
@@ -3007,6 +3007,7 @@ class TCPDF {
public function Error($msg) {
// unset all class variables
$this->_destroy(true);
+ $msg = htmlspecialchars($msg, ENT_QUOTES, 'UTF-8');
if (defined('K_TCPDF_THROW_EXCEPTION_ERROR') AND !K_TCPDF_THROW_EXCEPTION_ERROR) {
die('TCPDF ERROR: '.$msg);
} else {
@@ -4251,7 +4252,7 @@ class TCPDF {
* @param string $style Font style. Possible values are (case insensitive):
empty string: regular (default)
B: bold
I: italic
BI or IB: bold italic
* @param string $fontfile The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
* @return array|false array containing the font data, or false in case of error.
- * @param mixed $subset if true embedd only a subset of the font (stores only the information related to the used characters); if false embedd full font; if 'default' uses the default value set using setFontSubsetting(). This option is valid only for TrueTypeUnicode fonts. If you want to enable users to change the document, set this parameter to false. If you subset the font, the person who receives your PDF would need to have your same font in order to make changes to your PDF. The file size of the PDF would also be smaller because you are embedding only part of a font.
+ * @param mixed $subset if true embed only a subset of the font (stores only the information related to the used characters); if false embed full font; if 'default' uses the default value set using setFontSubsetting(). This option is valid only for TrueTypeUnicode fonts. If you want to enable users to change the document, set this parameter to false. If you subset the font, the person who receives your PDF would need to have your same font in order to make changes to your PDF. The file size of the PDF would also be smaller because you are embedding only part of a font.
* @public
* @since 1.5
* @see SetFont(), setFontSubsetting()
@@ -4431,7 +4432,7 @@ class TCPDF {
$this->Error('All fonts must be embedded in PDF/A mode!');
}
} else {
- $this->Error('Unknow font type: '.$type.'');
+ $this->Error('Unknown font type: '.$type.'');
}
// set name if unset
if (empty($name)) {
@@ -4521,7 +4522,7 @@ class TCPDF {
* @param string $style Font style. Possible values are (case insensitive):
empty string: regular
B: bold
I: italic
U: underline
D: line through
O: overline
or any combination. The default value is regular. Bold and italic styles do not apply to Symbol and ZapfDingbats basic fonts or other fonts when not defined.
* @param float|null $size Font size in points. The default value is the current size. If no size has been specified since the beginning of the document, the value taken is 12
* @param string $fontfile The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
- * @param mixed $subset if true embedd only a subset of the font (stores only the information related to the used characters); if false embedd full font; if 'default' uses the default value set using setFontSubsetting(). This option is valid only for TrueTypeUnicode fonts. If you want to enable users to change the document, set this parameter to false. If you subset the font, the person who receives your PDF would need to have your same font in order to make changes to your PDF. The file size of the PDF would also be smaller because you are embedding only part of a font.
+ * @param mixed $subset if true embed only a subset of the font (stores only the information related to the used characters); if false embed full font; if 'default' uses the default value set using setFontSubsetting(). This option is valid only for TrueTypeUnicode fonts. If you want to enable users to change the document, set this parameter to false. If you subset the font, the person who receives your PDF would need to have your same font in order to make changes to your PDF. The file size of the PDF would also be smaller because you are embedding only part of a font.
* @param boolean $out if true output the font size command, otherwise only set the font properties.
* @author Nicola Asuni
* @public
@@ -4931,6 +4932,32 @@ class TCPDF {
}
}
+ /**
+ * Embed the attached files.
+ * @since 6.9.000 (2025-02-11)
+ * @public
+ */
+ public function EmbedFile($opt) {
+ if (!$this->pdfa_mode || ($this->pdfa_mode && $this->pdfa_version == 3)) {
+ if ((($opt['Subtype'] == 'FileAttachment')) AND (!TCPDF_STATIC::empty_string($opt['FS']))
+ AND (@TCPDF_STATIC::file_exists($opt['FS']) OR TCPDF_STATIC::isValidURL($opt['FS']))
+ AND (!isset($this->embeddedfiles[basename($opt['FS'])]))) {
+ $this->embeddedfiles[basename($opt['FS'])] = array('f' => ++$this->n, 'n' => ++$this->n, 'file' => $opt['FS']);
+ }
+ }
+ }
+
+ /**
+ * Embed the attached files.
+ * @since 6.9.000 (2025-02-11)
+ * @public
+ */
+ public function EmbedFileFromString($filename, $content) {
+ if (!$this->pdfa_mode || ($this->pdfa_mode && $this->pdfa_version == 3)) {
+ $this->embeddedfiles[$filename] = array('f' => ++$this->n, 'n' => ++$this->n, 'content' => $content );
+ }
+ }
+
/**
* Embedd the attached files.
* @since 4.4.000 (2008-12-07)
@@ -4944,7 +4971,12 @@ class TCPDF {
}
reset($this->embeddedfiles);
foreach ($this->embeddedfiles as $filename => $filedata) {
- $data = $this->getCachedFileContents($filedata['file']);
+ $data = false;
+ if (isset($filedata['file']) && !empty($filedata['file'])) {
+ $data = $this->getCachedFileContents($filedata['file']);
+ } elseif ($filedata['content'] && !empty($filedata['content'])) {
+ $data = $filedata['content'];
+ }
if ($data !== FALSE) {
$rawsize = strlen($data);
if ($rawsize > 0) {
@@ -4962,11 +4994,10 @@ class TCPDF {
$filter = '';
if ($this->compress) {
$data = gzcompress($data);
- $filter = ' /Filter /FlateDecode';
+ $filter .= ' /Filter /FlateDecode';
}
-
if ($this->pdfa_version == 3) {
- $filter = ' /Subtype /text#2Fxml';
+ $filter .= ' /Subtype /text#2Fxml';
}
$stream = $this->_getrawstream($data, $filedata['n']);
@@ -6232,7 +6263,7 @@ class TCPDF {
* @param array|null $cellpadding Internal cell padding, if empty uses default cell padding.
* @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:
0: no border (default)
1: frame
or a string containing some or all of the following characters (in any order):
L: left
T: top
R: right
B: bottom
or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @return float Return the minimal height needed for multicell method for printing the $txt param.
- * @author Alexander Escalona Fern\E1ndez, Nicola Asuni
+ * @author Alexander Escalona Fern\E1ndez,2026 Nicola Asuni
* @public
* @since 4.5.011
*/
@@ -6428,7 +6459,7 @@ class TCPDF {
// replacement for SHY character (minus symbol)
$shy_replacement = 45;
$shy_replacement_char = TCPDF_FONTS::unichr($shy_replacement, $this->isunicode);
- // widht for SHY replacement
+ // width for SHY replacement
$shy_replacement_width = $this->GetCharWidth($shy_replacement);
// page width
$pw = $w = $this->w - $this->lMargin - $this->rMargin;
@@ -6886,8 +6917,8 @@ class TCPDF {
// fallback to avoid division by zero
$h = $h == 0 ? 1 : $h;
$ratio_wh = ($w / $h);
- if (($y + $h) > $this->PageBreakTrigger) {
- $h = $this->PageBreakTrigger - $y;
+ if (($y + $h) > $this->PageBreakTrigger + $this->bMargin) {
+ $h = $this->PageBreakTrigger + $this->bMargin - $y;
$w = ($h * $ratio_wh);
}
if ((!$this->rtl) AND (($x + $w) > ($this->w - $this->rMargin))) {
@@ -6988,7 +7019,7 @@ class TCPDF {
unset($imgdata);
$imsize = @getimagesize($file);
if ($imsize === FALSE) {
- unlink($file);
+ $this->_unlink($file);
$file = $original_file;
}
}
@@ -7221,7 +7252,7 @@ class TCPDF {
$tempname = TCPDF_STATIC::getObjFilename('img', $this->file_id);
$img->writeImage($tempname);
$info = TCPDF_IMAGES::_parsejpeg($tempname);
- unlink($tempname);
+ $this->_unlink($tempname);
$img->destroy();
} catch(Exception $e) {
$info = false;
@@ -7401,12 +7432,16 @@ class TCPDF {
}
}
imagepng($imgalpha, $tempfile_alpha);
- imagedestroy($imgalpha);
+ if (PHP_VERSION_ID < 80000) {
+ imagedestroy($imgalpha);
+ }
// extract image without alpha channel
$imgplain = imagecreatetruecolor($wpx, $hpx);
imagecopy($imgplain, $img, 0, 0, 0, 0, $wpx, $hpx);
imagepng($imgplain, $tempfile_plain);
- imagedestroy($imgplain);
+ if (PHP_VERSION_ID < 80000) {
+ imagedestroy($imgplain);
+ }
$parsed = true;
} catch (Exception $e) {
// GD fails
@@ -7848,7 +7883,7 @@ class TCPDF {
* @since 4.5.016 (2009-02-24)
*/
public function _destroy($destroyall=false, $preserve_objcopy=false) {
- if (isset(self::$cleaned_ids[$this->file_id])) {
+ if (isset($this->file_id) && isset(self::$cleaned_ids[$this->file_id])) {
$destroyall = false;
}
if ($destroyall AND !$preserve_objcopy && isset($this->file_id)) {
@@ -7857,15 +7892,16 @@ class TCPDF {
if ($handle = @opendir(K_PATH_CACHE)) {
while ( false !== ( $file_name = readdir( $handle ) ) ) {
if (strpos($file_name, '__tcpdf_'.$this->file_id.'_') === 0) {
- unlink(K_PATH_CACHE.$file_name);
+ $this->_unlink(K_PATH_CACHE.$file_name);
}
}
closedir($handle);
}
if (isset($this->imagekeys)) {
foreach($this->imagekeys as $file) {
- if (strpos($file, K_PATH_CACHE) === 0 && TCPDF_STATIC::file_exists($file)) {
- @unlink($file);
+ if ((strpos($file, K_PATH_CACHE.'__tcpdf_'.$this->file_id.'_') === 0)
+ && TCPDF_STATIC::file_exists($file)) {
+ $this->_unlink($file);
}
}
}
@@ -8310,15 +8346,15 @@ class TCPDF {
break;
}
case 'locked': {
- $fval += 1 << 8;
+ $fval += 1 << 7;
break;
}
case 'togglenoview': {
- $fval += 1 << 9;
+ $fval += 1 << 8;
break;
}
case 'lockedcontents': {
- $fval += 1 << 10;
+ $fval += 1 << 9;
break;
}
default: {
@@ -8895,7 +8931,7 @@ class TCPDF {
$this->_out('<< /Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.'] >>'."\n".'endobj');
}
foreach ($this->FontFiles as $file => $info) {
- // search and get font file to embedd
+ // search and get font file to embed
$fontfile = TCPDF_FONTS::getFontFullPath($file, $info['fontdir']);
if (!TCPDF_STATIC::empty_string($fontfile)) {
$font = file_get_contents($fontfile);
@@ -9110,9 +9146,9 @@ class TCPDF {
$this->_newobj();
// Embed CIDToGIDMap
// A specification of the mapping from CIDs to glyph indices
- // search and get CTG font file to embedd
+ // search and get CTG font file to embed
$ctgfile = strtolower($font['ctg']);
- // search and get ctg font file to embedd
+ // search and get ctg font file to embed
$fontfile = TCPDF_FONTS::getFontFullPath($ctgfile, $fontdir);
if (TCPDF_STATIC::empty_string($fontfile)) {
$this->Error('Font file not found: '.$ctgfile);
@@ -9137,7 +9173,7 @@ class TCPDF {
* A Type 0 CIDFont contains glyph descriptions based on the Adobe Type 1 font format
* @param array $font font data
* @protected
- * @author Andrew Whitehead, Nicola Asuni, Yukihiro Nakadaira
+ * @author Andrew Whitehead,2026 Nicola Asuni, Yukihiro Nakadaira
* @since 3.2.000 (2008-06-23)
*/
protected function _putcidfont0($font) {
@@ -9628,6 +9664,17 @@ class TCPDF {
$this->custom_xmp_rdf = $xmp;
}
+ /**
+ * Set additional XMP data to be added to the default XMP data for PDF/A extensions.
+ * IMPORTANT: This data is added as-is without controls, so you have to validate your data before using this method!
+ * @param string $xmp Custom XMP RDF data.
+ * @since 6.9.0 (2025-02-14)
+ * @public
+ */
+ public function setExtraXMPPdfaextension($xmp) {
+ $this->custom_xmp_rdf_pdfaExtension = $xmp;
+ }
+
/**
* Put XMP data object and return ID.
* @return int The object ID.
@@ -9762,6 +9809,7 @@ class TCPDF {
$xmp .= "\t\t\t\t\t\t\t".''."\n";
$xmp .= "\t\t\t\t\t\t".''."\n";
$xmp .= "\t\t\t\t\t".''."\n";
+ $xmp .= $this->custom_xmp_rdf_pdfaExtension;
$xmp .= "\t\t\t\t".''."\n";
$xmp .= "\t\t\t".''."\n";
$xmp .= "\t\t".''."\n";
@@ -9800,7 +9848,11 @@ class TCPDF {
}
// start catalog
$oid = $this->_newobj();
- $out = '<< /Type /Catalog';
+ $out = '<< ';
+ if (!empty($this->efnames)) {
+ $out .= ' /AF [ '. implode(' ', $this->efnames) .' ]';
+ }
+ $out .= ' /Type /Catalog';
$out .= ' /Version /'.$this->PDFVersion;
//$out .= ' /Extensions <<>>';
$out .= ' /Pages 1 0 R';
@@ -12275,7 +12327,7 @@ class TCPDF {
* @param int $head_style (0 = draw only arrowhead arms, 1 = draw closed arrowhead, but no fill, 2 = closed and filled arrowhead, 3 = filled arrowhead)
* @param float $arm_size length of arrowhead arms
* @param int $arm_angle angle between an arm and the shaft
- * @author Piotr Galecki, Nicola Asuni, Andy Meier
+ * @author Piotr Galecki,2026 Nicola Asuni, Andy Meier
* @since 4.6.018 (2009-07-10)
*/
public function Arrow($x0, $y0, $x1, $y1, $head_style=0, $arm_size=5, $arm_angle=15) {
@@ -12340,7 +12392,7 @@ class TCPDF {
* @param float $x X position in user units of the destiantion on the selected page (default = -1 = current position;).
* @return string|false Stripped named destination identifier or false in case of error.
* @public
- * @author Christian Deligant, Nicola Asuni
+ * @author Christian Deligant,2026 Nicola Asuni
* @since 5.9.097 (2011-06-23)
*/
public function setDestination($name, $y=-1, $page='', $x=-1) {
@@ -12393,7 +12445,7 @@ class TCPDF {
/**
* Insert Named Destinations.
* @protected
- * @author Johannes G\FCntert, Nicola Asuni
+ * @author Johannes G\FCntert,2026 Nicola Asuni
* @since 5.9.098 (2011-06-23)
*/
protected function _putdests() {
@@ -12502,7 +12554,7 @@ class TCPDF {
/**
* Create a bookmark PDF string.
* @protected
- * @author Olivier Plathey, Nicola Asuni
+ * @author Olivier Plathey,2026 Nicola Asuni
* @since 2.1.002 (2008-02-12)
*/
protected function _putbookmarks() {
@@ -12628,7 +12680,7 @@ class TCPDF {
* Adds a javascript
* @param string $script Javascript code
* @public
- * @author Johannes G\FCntert, Nicola Asuni
+ * @author Johannes G\FCntert,2026 Nicola Asuni
* @since 2.1.002 (2008-02-12)
*/
public function IncludeJS($script) {
@@ -12657,7 +12709,7 @@ class TCPDF {
/**
* Create a javascript PDF string.
* @protected
- * @author Johannes G\FCntert, Nicola Asuni
+ * @author Johannes G\FCntert,2026 Nicola Asuni
* @since 2.1.002 (2008-02-12)
*/
protected function _putjavascript() {
@@ -12715,7 +12767,7 @@ class TCPDF {
* @param int $h height
* @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
* @protected
- * @author Denis Van Nuffelen, Nicola Asuni
+ * @author Denis Van Nuffelen,2026 Nicola Asuni
* @since 2.1.002 (2008-02-12)
*/
protected function _addfield($type, $name, $x, $y, $w, $h, $prop) {
@@ -14448,7 +14500,7 @@ class TCPDF {
* @param array $col1 first color (Grayscale, RGB or CMYK components).
* @param array $col2 second color (Grayscale, RGB or CMYK components).
* @param array $coords array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0).
- * @author Andreas W\FCrmser, Nicola Asuni
+ * @author Andreas W\FCrmser,2026 Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @public
*/
@@ -14466,7 +14518,7 @@ class TCPDF {
* @param array $col1 first color (Grayscale, RGB or CMYK components).
* @param array $col2 second color (Grayscale, RGB or CMYK components).
* @param array $coords array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined.
- * @author Andreas W\FCrmser, Nicola Asuni
+ * @author Andreas W\FCrmser,2026 Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @public
*/
@@ -14489,7 +14541,7 @@ class TCPDF {
* @param array $coords_min minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0
* @param array $coords_max maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1
* @param boolean $antialias A flag indicating whether to filter the shading function to prevent aliasing artifacts.
- * @author Andreas W\FCrmser, Nicola Asuni
+ * @author Andreas W\FCrmser,2026 Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @public
*/
@@ -14581,7 +14633,7 @@ class TCPDF {
* @param float $y ordinate of the top left corner of the rectangle.
* @param float $w width of the rectangle.
* @param float $h height of the rectangle.
- * @author Andreas W\FCrmser, Nicola Asuni
+ * @author Andreas W\FCrmser,2026 Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @protected
*/
@@ -14907,7 +14959,7 @@ class TCPDF {
* @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
* @param float $cw indicates whether to go clockwise (default: true).
* @param float $o origin of angles (0 for 3 o'clock, 90 for noon, 180 for 9 o'clock, 270 for 6 o'clock). Default: 90.
- * @author Maxime Delorme, Nicola Asuni
+ * @author Maxime Delorme,2026 Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @public
*/
@@ -14928,7 +14980,7 @@ class TCPDF {
* @param float $cw indicates whether to go clockwise.
* @param float $o origin of angles (0 for 3 o'clock, 90 for noon, 180 for 9 o'clock, 270 for 6 o'clock).
* @param integer $nc Number of curves used to draw a 90 degrees portion of arc.
- * @author Maxime Delorme, Nicola Asuni
+ * @author Maxime Delorme,2026 Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @public
*/
@@ -14972,7 +15024,7 @@ class TCPDF {
* @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:
0: no border (default)
1: frame
or a string containing some or all of the following characters (in any order):
L: left
T: top
R: right
B: bottom
or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @param boolean $fitonpage if true the image is resized to not exceed page dimensions.
* @param boolean $fixoutvals if true remove values outside the bounding box.
- * @author Valentin Schmidt, Nicola Asuni
+ * @author Valentin Schmidt,2026 Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @public
*/
@@ -16396,7 +16448,7 @@ class TCPDF {
* @since 3.2.000 (2008-06-20)
*/
protected function getHtmlDomArray($html) {
- // set inheritable properties fot the first void element
+ // set inheritable properties for the first void element
// possible inheritable properties are: azimuth, border-collapse, border-spacing, caption-side, color, cursor, direction, empty-cells, font, font-family, font-stretch, font-size, font-size-adjust, font-style, font-variant, font-weight, letter-spacing, line-height, list-style, list-style-image, list-style-position, list-style-type, orphans, page, page-break-inside, quotes, speak, speak-header, text-align, text-indent, text-transform, volume, white-space, widows, word-spacing
$dom = array(
array(
@@ -16862,7 +16914,7 @@ class TCPDF {
$dom[$key]['height'] = $dom[$key]['style']['height'];
}
// check for text alignment
- if (isset($dom[$key]['style']['text-align'])) {
+ if (isset($dom[$key]['style']['text-align'][0])) {
$dom[$key]['align'] = strtoupper($dom[$key]['style']['text-align'][0]);
}
// check for CSS border properties
@@ -17259,7 +17311,7 @@ class TCPDF {
$hlen = intval(substr($data, 0, $hpos));
$hash = substr($data, $hpos + 1, $hlen);
$encoded = substr($data, $hpos + 2 + $hlen);
- if ($hash != $this->hashTCPDFtag($encoded)) {
+ if (!hash_equals( $this->hashTCPDFtag($encoded), $hash)) {
$this->Error('Invalid parameters');
}
return json_decode(urldecode($encoded), true);
@@ -17425,6 +17477,9 @@ class TCPDF {
}
}
if ($key == $maxel) break;
+ if ($dom[$key]['tag'] AND $dom[$key]['opening'] AND !empty($dom[$key]['attribute']['id'])) {
+ $this->setDestination($dom[$key]['attribute']['id']);
+ }
if ($dom[$key]['tag'] AND isset($dom[$key]['attribute']['pagebreak'])) {
// check for pagebreak
if (($dom[$key]['attribute']['pagebreak'] == 'true') OR ($dom[$key]['attribute']['pagebreak'] == 'left') OR ($dom[$key]['attribute']['pagebreak'] == 'right')) {
@@ -18867,6 +18922,29 @@ class TCPDF {
unset($dom);
}
+ /**
+ * Check if the path is relative.
+ * @param string $path path to check
+ * @return boolean true if the path is relative
+ * @protected
+ * @since 6.9.1
+ */
+ protected function isRelativePath($path) {
+ return (strpos(str_ireplace('%2E', '.', $this->unhtmlentities($path)), '..') !== false);
+ }
+
+ /**
+ * Check if it contains a non-allowed external protocol.
+ * @param string $path path to check
+ * @return boolean true if the protocol is not allowed.
+ * @protected
+ * @since 6.9.3
+ */
+ protected function hasExtForbiddenProtocol($path) {
+ return ((strpos($path, '://') !== false)
+ && (preg_match('|^https?://|', $path) !== 1));
+ }
+
/**
* Process opening tags.
* @param array $dom html dom array
@@ -19059,13 +19137,15 @@ class TCPDF {
} else if (preg_match('@^data:image/([^;]*);base64,(.*)@', $imgsrc, $reg)) {
$imgsrc = '@'.base64_decode($reg[2]);
$type = $reg[1];
- } elseif (strpos($imgsrc, '../') !== false) {
+ } elseif ($this->isRelativePath($imgsrc)) {
// accessing parent folders is not allowed
break;
} elseif ( $this->allowLocalFiles && substr($imgsrc, 0, 7) === 'file://') {
// get image type from a local file path
$imgsrc = substr($imgsrc, 7);
$type = TCPDF_IMAGES::getImageFileType($imgsrc);
+ } elseif ($this->hasExtForbiddenProtocol($imgsrc)) {
+ break;
} else {
if (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
// fix image path
@@ -19124,7 +19204,7 @@ class TCPDF {
$imglink = '';
if (isset($this->HREF['url']) AND !TCPDF_STATIC::empty_string($this->HREF['url'])) {
$imglink = $this->HREF['url'];
- if ($imglink[0] == '#') {
+ if ($imglink[0] == '#' AND isset($imglink[1]) AND is_numeric($imglink[1])) {
// convert url to internal link
$lnkdata = explode(',', $imglink);
if (isset($lnkdata[0])) {
@@ -19985,7 +20065,7 @@ class TCPDF {
}
}
if (!$in_table_head) { // we are not inside a thead section
- $this->cell_padding = isset($table_el['old_cell_padding']) ? $table_el['old_cell_padding'] : null;
+ $this->cell_padding = isset($table_el['old_cell_padding']) ? $table_el['old_cell_padding'] : array('T' => 0, 'R' => 0, 'B' => 0, 'L' => 0);
// reset row height
$this->resetLastH();
if (($this->page == ($this->numpages - 1)) AND ($this->pageopen[$this->numpages])) {
@@ -23184,8 +23264,11 @@ class TCPDF {
$error_message = sprintf('SVG Error: %s at line %d', xml_error_string(xml_get_error_code($parser)), xml_get_current_line_number($parser));
$this->Error($error_message);
}
- // free this XML parser
- xml_parser_free($parser);
+
+ // free this XML parser (does nothing in PHP >= 8.0)
+ if (function_exists('xml_parser_free') && PHP_VERSION_ID < 80000) {
+ xml_parser_free($parser);
+ }
// >= PHP 7.0.0 "explicitly unset the reference to parser to avoid memory leaks"
unset($parser);
@@ -23416,7 +23499,8 @@ class TCPDF {
$gradient['coords'][4] /= $w;
} elseif ($gradient['mode'] == 'percentage') {
foreach($gradient['coords'] as $key => $val) {
- $gradient['coords'][$key] = (intval($val) / 100);
+ $val = floatval($val) / 100;
+ $gradient['coords'][$key] = $val;
if ($val < 0) {
$gradient['coords'][$key] = 0;
} elseif ($val > 1) {
@@ -23452,6 +23536,8 @@ class TCPDF {
$fill_color = TCPDF_COLORS::convertHTMLColorToDec($svgstyle['fill'], $this->spot_colors);
if ($svgstyle['fill-opacity'] != 1) {
$this->setAlpha($this->alpha['CA'], 'Normal', $svgstyle['fill-opacity'], false);
+ } elseif (preg_match('/rgba\(\d+%?,\s*\d+%?,\s*\d+%?,\s*(\d+(?:\.\d+)?)\)/i', $svgstyle['fill'], $rgba_matches)) {
+ $this->setAlpha($this->alpha['CA'], 'Normal', $rgba_matches[1], false);
}
$this->setFillColorArray($fill_color);
if ($svgstyle['fill-rule'] == 'evenodd') {
@@ -23485,7 +23571,7 @@ class TCPDF {
if (preg_match('/font-family[\s]*:[\s]*([^\;\"]*)/si', $svgstyle['font'], $regs)) {
$font_family = $this->getFontFamilyName($regs[1]);
} else {
- $font_family = $svgstyle['font-family'];
+ $font_family = $this->getFontFamilyName($svgstyle['font-family']);
}
if (preg_match('/font-size[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) {
$font_size = trim($regs[1]);
@@ -23639,9 +23725,11 @@ class TCPDF {
}
$params = array();
if (isset($val[2])) {
- // get curve parameters
- preg_match_all('/-?\d*\.?\d+/', trim($val[2]), $matches);
- $rawparams = $matches[0];
+ // get curve parameters, see https://github.com/tecnickcom/TCPDF/issues/767
+ $rawparams = preg_split('/([\,\s]+)/si', trim($val[2]));
+ $rawparams = array_filter($rawparams, function($p) {
+ return trim($p) != '';
+ });
$params = array();
foreach ($rawparams as $ck => $cp) {
$params[$ck] = $this->getHTMLUnitToUnits($cp, 0, $this->svgunit, false);
@@ -24338,6 +24426,7 @@ class TCPDF {
}
$this->StopTransform();
}
+
break;
}
case 'ellipse': {
@@ -24466,6 +24555,9 @@ class TCPDF {
$img = '@'.base64_decode(substr($img, strlen($m[0])));
} else {
// fix image path
+ if ($this->isRelativePath($img) || $this->hasExtForbiddenProtocol($img)) {
+ break;
+ }
if (!TCPDF_STATIC::empty_string($this->svgdir) AND (($img[0] == '.') OR (basename($img) == $img))) {
// replace relative path with full server path
$img = $this->svgdir.'/'.$img;
@@ -24648,7 +24740,7 @@ class TCPDF {
*/
protected function endSVGElementHandler($parser, $name) {
$name = $this->removeTagNamespace($name);
- if ($this->svgdefsmode AND !in_array($name, array('defs', 'clipPath', 'linearGradient', 'radialGradient', 'stop'))) {;
+ if ($this->svgdefsmode AND !in_array($name, array('defs', 'clipPath', 'linearGradient', 'radialGradient', 'stop'))) {
if (end($this->svgdefs) !== FALSE) {
$last_svgdefs_id = key($this->svgdefs);
if (isset($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'])) {
@@ -24786,6 +24878,20 @@ class TCPDF {
return TCPDF_STATIC::file_exists($file);
}
+ /**
+ * Wrapper for unlink with disabled protocols.
+ * @param string $file
+ * @return bool
+ */
+ protected function _unlink($file)
+ {
+ if ((strpos($file, '://') !== false) && ((substr($file, 0, 7) !== 'file://') || (!$this->allowLocalFiles))) {
+ // forbidden protocol
+ return false;
+ }
+ return @unlink($file);
+ }
+
} // END OF TCPDF CLASS
//============================================================+
diff --git a/tools/tcpdf/tcpdf_autoconfig.php b/tools/tcpdf/tcpdf_autoconfig.php
index 2bcfccb82..dd1404e09 100644
--- a/tools/tcpdf/tcpdf_autoconfig.php
+++ b/tools/tcpdf/tcpdf_autoconfig.php
@@ -3,11 +3,11 @@
// File name : tcpdf_autoconfig.php
// Version : 1.1.1
// Begin : 2013-05-16
-// Last Update : 2014-12-18
+// Last Update : 2025-04-18
// Authors : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
+// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
-// Copyright (C) 2011-2014 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2011-2026 Nicola Asuni - Tecnick.com LTD
//
// This file is part of TCPDF software library.
//
@@ -37,9 +37,14 @@
* @file
* Try to automatically configure some TCPDF constants if not defined.
* @package com.tecnick.tcpdf
- * @version 1.1.1
+ * @version 1.2.1
*/
+// Disable phar stream wrapper globally.
+// if (in_array('phar', stream_get_wrappers(), true)) {
+// stream_wrapper_unregister('phar');
+// }
+
// DOCUMENT_ROOT fix for IIS Webserver
if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
if(isset($_SERVER['SCRIPT_FILENAME'])) {
@@ -149,7 +154,7 @@ if (!defined('PDF_HEADER_TITLE')) {
}
if (!defined('PDF_HEADER_STRING')) {
- define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
+ define ('PDF_HEADER_STRING', "by2026 Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
}
if (!defined('PDF_UNIT')) {
@@ -201,7 +206,7 @@ if (!defined('PDF_FONT_MONOSPACED')) {
}
if (!defined('PDF_IMAGE_SCALE_RATIO')) {
- define ('PDF_IMAGE_SCALE_RATIO', 1.25);
+ define ('PDF_IMAGE_SCALE_RATIO', 96/72);
}
if (!defined('HEAD_MAGNIFICATION')) {
@@ -240,6 +245,11 @@ if (!defined('K_TIMEZONE')) {
define('K_TIMEZONE', @date_default_timezone_get());
}
+// Custom cURL options for curl_setopt_array.
+if (!defined('K_CURLOPTS')) {
+ define('K_CURLOPTS', array());
+}
+
//============================================================+
// END OF FILE
//============================================================+
diff --git a/tools/tcpdf/tcpdf_barcodes_1d.php b/tools/tcpdf/tcpdf_barcodes_1d.php
index 45d35616c..34cb6da17 100644
--- a/tools/tcpdf/tcpdf_barcodes_1d.php
+++ b/tools/tcpdf/tcpdf_barcodes_1d.php
@@ -5,9 +5,9 @@
// Begin : 2008-06-09
// Last Update : 2014-10-20
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
+// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
-// Copyright (C) 2008-2014 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2008-2026 Nicola Asuni - Tecnick.com LTD
//
// This file is part of TCPDF software library.
//
@@ -22,7 +22,7 @@
// See the GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF. If not, see .
+// along with TCPDF. If not, see .
//
// See LICENSE.TXT file for more information.
// -------------------------------------------------------------------
@@ -234,7 +234,9 @@ class TCPDFBarcode {
ob_start();
imagepng($png);
$imagedata = ob_get_clean();
- imagedestroy($png);
+ if (PHP_VERSION_ID < 80000) {
+ imagedestroy($png);
+ }
return $imagedata;
}
}
diff --git a/tools/tcpdf/tcpdf_barcodes_2d.php b/tools/tcpdf/tcpdf_barcodes_2d.php
index 730361bd8..0e1163653 100644
--- a/tools/tcpdf/tcpdf_barcodes_2d.php
+++ b/tools/tcpdf/tcpdf_barcodes_2d.php
@@ -5,9 +5,9 @@
// Begin : 2009-04-07
// Last Update : 2014-05-20
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
+// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
-// Copyright (C) 2009-2014 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2009-2026 Nicola Asuni - Tecnick.com LTD
//
// This file is part of TCPDF software library.
//
@@ -22,7 +22,7 @@
// See the GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF. If not, see .
+// along with TCPDF. If not, see .
//
// See LICENSE.TXT file for more information.
// -------------------------------------------------------------------
@@ -238,7 +238,9 @@ class TCPDF2DBarcode {
ob_start();
imagepng($png);
$imagedata = ob_get_clean();
- imagedestroy($png);
+ if (PHP_VERSION_ID < 80000) {
+ imagedestroy($png);
+ }
return $imagedata;
}
}
diff --git a/tools/tcpdf/tcpdf_import.php b/tools/tcpdf/tcpdf_import.php
deleted file mode 100644
index 57f9f4f4b..000000000
--- a/tools/tcpdf/tcpdf_import.php
+++ /dev/null
@@ -1,104 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : This is a PHP class extension of the TCPDF library to
-// import existing PDF documents.
-//
-//============================================================+
-
-/**
- * @file
- * !!! THIS CLASS IS UNDER DEVELOPMENT !!!
- * This is a PHP class extension of the TCPDF (http://www.tcpdf.org) library to import existing PDF documents.
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.001
- */
-
-// include the TCPDF class
-require_once(dirname(__FILE__).'/tcpdf.php');
-// include PDF parser class
-require_once(dirname(__FILE__).'/tcpdf_parser.php');
-
-/**
- * @class TCPDF_IMPORT
- * !!! THIS CLASS IS UNDER DEVELOPMENT !!!
- * PHP class extension of the TCPDF (http://www.tcpdf.org) library to import existing PDF documents.
- * @package com.tecnick.tcpdf
- * @brief PHP class extension of the TCPDF library to import existing PDF documents.
- * @version 1.0.001
- * @author Nicola Asuni - info@tecnick.com
- */
-class TCPDF_IMPORT extends TCPDF {
-
- /**
- * Import an existing PDF document
- * @param string $filename Filename of the PDF document to import.
- * @return void
- * @public
- * @since 1.0.000 (2011-05-24)
- */
- public function importPDF($filename) {
- // load document
- $rawdata = file_get_contents($filename);
- if ($rawdata === false) {
- $this->Error('Unable to get the content of the file: '.$filename);
- }
- // configuration parameters for parser
- $cfg = array(
- 'die_for_errors' => false,
- 'ignore_filter_decoding_errors' => true,
- 'ignore_missing_filter_decoders' => true,
- );
- try {
- // parse PDF data
- $pdf = new TCPDF_PARSER($rawdata, $cfg);
- } catch (Exception $e) {
- die($e->getMessage());
- }
- // get the parsed data
- $data = $pdf->getParsedData();
- // release some memory
- unset($rawdata);
-
- // ...
-
-
- print_r($data); // DEBUG
-
-
- unset($pdf);
- }
-
-} // END OF CLASS
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/tcpdf_parser.php b/tools/tcpdf/tcpdf_parser.php
deleted file mode 100644
index 4156230a3..000000000
--- a/tools/tcpdf/tcpdf_parser.php
+++ /dev/null
@@ -1,815 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : This is a PHP class for parsing PDF documents.
-//
-//============================================================+
-
-/**
- * @file
- * This is a PHP class for parsing PDF documents.
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.15
- */
-
-// include class for decoding filters
-require_once(dirname(__FILE__).'/include/tcpdf_filters.php');
-
-/**
- * @class TCPDF_PARSER
- * This is a PHP class for parsing PDF documents.
- * @package com.tecnick.tcpdf
- * @brief This is a PHP class for parsing PDF documents..
- * @version 1.0.15
- * @author Nicola Asuni - info@tecnick.com
- */
-class TCPDF_PARSER {
-
- /**
- * Raw content of the PDF document.
- * @private
- */
- private $pdfdata = '';
-
- /**
- * XREF data.
- * @protected
- */
- protected $xref = array();
-
- /**
- * Array of PDF objects.
- * @protected
- */
- protected $objects = array();
-
- /**
- * Class object for decoding filters.
- * @private
- */
- private $FilterDecoders;
-
- /**
- * Array of configuration parameters.
- * @private
- */
- private $cfg = array(
- 'die_for_errors' => false,
- 'ignore_filter_decoding_errors' => true,
- 'ignore_missing_filter_decoders' => true,
- );
-
-// -----------------------------------------------------------------------------
-
- /**
- * Parse a PDF document an return an array of objects.
- * @param string $data PDF data to parse.
- * @param array $cfg Array of configuration parameters:
- * 'die_for_errors' : if true termitate the program execution in case of error, otherwise thows an exception;
- * 'ignore_filter_decoding_errors' : if true ignore filter decoding errors;
- * 'ignore_missing_filter_decoders' : if true ignore missing filter decoding errors.
- * @public
- * @since 1.0.000 (2011-05-24)
- */
- public function __construct($data, $cfg=array()) {
- if (empty($data)) {
- $this->Error('Empty PDF data.');
- }
- // find the pdf header starting position
- if (($trimpos = strpos($data, '%PDF-')) === FALSE) {
- $this->Error('Invalid PDF data: missing %PDF header.');
- }
- // get PDF content string
- $this->pdfdata = substr($data, $trimpos);
- // get length
- $pdflen = strlen($this->pdfdata);
- // set configuration parameters
- $this->setConfig($cfg);
- // get xref and trailer data
- $this->xref = $this->getXrefData();
- // parse all document objects
- $this->objects = array();
- foreach ($this->xref['xref'] as $obj => $offset) {
- if (!isset($this->objects[$obj]) AND ($offset > 0)) {
- // decode objects with positive offset
- $this->objects[$obj] = $this->getIndirectObject($obj, $offset, true);
- }
- }
- // release some memory
- unset($this->pdfdata);
- $this->pdfdata = '';
- }
-
- /**
- * Set the configuration parameters.
- * @param array $cfg Array of configuration parameters:
- * 'die_for_errors' : if true termitate the program execution in case of error, otherwise thows an exception;
- * 'ignore_filter_decoding_errors' : if true ignore filter decoding errors;
- * 'ignore_missing_filter_decoders' : if true ignore missing filter decoding errors.
- * @public
- */
- protected function setConfig($cfg) {
- if (isset($cfg['die_for_errors'])) {
- $this->cfg['die_for_errors'] = !!$cfg['die_for_errors'];
- }
- if (isset($cfg['ignore_filter_decoding_errors'])) {
- $this->cfg['ignore_filter_decoding_errors'] = !!$cfg['ignore_filter_decoding_errors'];
- }
- if (isset($cfg['ignore_missing_filter_decoders'])) {
- $this->cfg['ignore_missing_filter_decoders'] = !!$cfg['ignore_missing_filter_decoders'];
- }
- }
-
- /**
- * Return an array of parsed PDF document objects.
- * @return array Array of parsed PDF document objects.
- * @public
- * @since 1.0.000 (2011-06-26)
- */
- public function getParsedData() {
- return array($this->xref, $this->objects);
- }
-
- /**
- * Get Cross-Reference (xref) table and trailer data from PDF document data.
- * @param int $offset xref offset (if know).
- * @param array $xref previous xref array (if any).
- * @return array containing xref and trailer data.
- * @protected
- * @since 1.0.000 (2011-05-24)
- */
- protected function getXrefData($offset=0, $xref=array()) {
- if ($offset == 0) {
- // find last startxref
- if (preg_match_all('/[\r\n]startxref[\s]*[\r\n]+([0-9]+)[\s]*[\r\n]+%%EOF/i', $this->pdfdata, $matches, PREG_SET_ORDER, $offset) == 0) {
- $this->Error('Unable to find startxref');
- }
- $matches = array_pop($matches);
- $startxref = $matches[1];
- } elseif (strpos($this->pdfdata, 'xref', $offset) == $offset) {
- // Already pointing at the xref table
- $startxref = $offset;
- } elseif (preg_match('/([0-9]+[\s][0-9]+[\s]obj)/i', $this->pdfdata, $matches, PREG_OFFSET_CAPTURE, $offset)) {
- // Cross-Reference Stream object
- $startxref = $offset;
- } elseif (preg_match('/[\r\n]startxref[\s]*[\r\n]+([0-9]+)[\s]*[\r\n]+%%EOF/i', $this->pdfdata, $matches, PREG_OFFSET_CAPTURE, $offset)) {
- // startxref found
- $startxref = $matches[1][0];
- } else {
- $this->Error('Unable to find startxref');
- }
- // check xref position
- if (strpos($this->pdfdata, 'xref', $startxref) == $startxref) {
- // Cross-Reference
- $xref = $this->decodeXref($startxref, $xref);
- } else {
- // Cross-Reference Stream
- $xref = $this->decodeXrefStream($startxref, $xref);
- }
- if (empty($xref)) {
- $this->Error('Unable to find xref');
- }
- return $xref;
- }
-
- /**
- * Decode the Cross-Reference section
- * @param int $startxref Offset at which the xref section starts (position of the 'xref' keyword).
- * @param array $xref Previous xref array (if any).
- * @return array containing xref and trailer data.
- * @protected
- * @since 1.0.000 (2011-06-20)
- */
- protected function decodeXref($startxref, $xref=array()) {
- $startxref += 4; // 4 is the length of the word 'xref'
- // skip initial white space chars: \x00 null (NUL), \x09 horizontal tab (HT), \x0A line feed (LF), \x0C form feed (FF), \x0D carriage return (CR), \x20 space (SP)
- $offset = $startxref + strspn($this->pdfdata, "\x00\x09\x0a\x0c\x0d\x20", $startxref);
- // initialize object number
- $obj_num = 0;
- // search for cross-reference entries or subsection
- while (preg_match('/([0-9]+)[\x20]([0-9]+)[\x20]?([nf]?)(\r\n|[\x20]?[\r\n])/', $this->pdfdata, $matches, PREG_OFFSET_CAPTURE, $offset) > 0) {
- if ($matches[0][1] != $offset) {
- // we are on another section
- break;
- }
- $offset += strlen($matches[0][0]);
- if ($matches[3][0] == 'n') {
- // create unique object index: [object number]_[generation number]
- $index = $obj_num.'_'.intval($matches[2][0]);
- // check if object already exist
- if (!isset($xref['xref'][$index])) {
- // store object offset position
- $xref['xref'][$index] = intval($matches[1][0]);
- }
- ++$obj_num;
- } elseif ($matches[3][0] == 'f') {
- ++$obj_num;
- } else {
- // object number (index)
- $obj_num = intval($matches[1][0]);
- }
- }
- // get trailer data
- if (preg_match('/trailer[\s]*<<(.*)>>/isU', $this->pdfdata, $matches, PREG_OFFSET_CAPTURE, $offset) > 0) {
- $trailer_data = $matches[1][0];
- if (!isset($xref['trailer']) OR empty($xref['trailer'])) {
- // get only the last updated version
- $xref['trailer'] = array();
- // parse trailer_data
- if (preg_match('/Size[\s]+([0-9]+)/i', $trailer_data, $matches) > 0) {
- $xref['trailer']['size'] = intval($matches[1]);
- }
- if (preg_match('/Root[\s]+([0-9]+)[\s]+([0-9]+)[\s]+R/i', $trailer_data, $matches) > 0) {
- $xref['trailer']['root'] = intval($matches[1]).'_'.intval($matches[2]);
- }
- if (preg_match('/Encrypt[\s]+([0-9]+)[\s]+([0-9]+)[\s]+R/i', $trailer_data, $matches) > 0) {
- $xref['trailer']['encrypt'] = intval($matches[1]).'_'.intval($matches[2]);
- }
- if (preg_match('/Info[\s]+([0-9]+)[\s]+([0-9]+)[\s]+R/i', $trailer_data, $matches) > 0) {
- $xref['trailer']['info'] = intval($matches[1]).'_'.intval($matches[2]);
- }
- if (preg_match('/ID[\s]*[\[][\s]*[<]([^>]*)[>][\s]*[<]([^>]*)[>]/i', $trailer_data, $matches) > 0) {
- $xref['trailer']['id'] = array();
- $xref['trailer']['id'][0] = $matches[1];
- $xref['trailer']['id'][1] = $matches[2];
- }
- }
- if (preg_match('/Prev[\s]+([0-9]+)/i', $trailer_data, $matches) > 0) {
- // get previous xref
- $xref = $this->getXrefData(intval($matches[1]), $xref);
- }
- } else {
- $this->Error('Unable to find trailer');
- }
- return $xref;
- }
-
- /**
- * Decode the Cross-Reference Stream section
- * @param int $startxref Offset at which the xref section starts.
- * @param array $xref Previous xref array (if any).
- * @return array containing xref and trailer data.
- * @protected
- * @since 1.0.003 (2013-03-16)
- */
- protected function decodeXrefStream($startxref, $xref=array()) {
- // try to read Cross-Reference Stream
- $xrefobj = $this->getRawObject($startxref);
- $xrefcrs = $this->getIndirectObject($xrefobj[1], $startxref, true);
- if (!isset($xref['trailer']) OR empty($xref['trailer'])) {
- // get only the last updated version
- $xref['trailer'] = array();
- $filltrailer = true;
- } else {
- $filltrailer = false;
- }
- if (!isset($xref['xref'])) {
- $xref['xref'] = array();
- }
- $valid_crs = false;
- $columns = 0;
- $sarr = $xrefcrs[0][1];
- if (!is_array($sarr)) {
- $sarr = array();
- }
- foreach ($sarr as $k => $v) {
- if (($v[0] == '/') AND ($v[1] == 'Type') AND (isset($sarr[($k +1)]) AND ($sarr[($k +1)][0] == '/') AND ($sarr[($k +1)][1] == 'XRef'))) {
- $valid_crs = true;
- } elseif (($v[0] == '/') AND ($v[1] == 'Index') AND (isset($sarr[($k +1)]))) {
- // first object number in the subsection
- $index_first = intval($sarr[($k +1)][1][0][1]);
- // number of entries in the subsection
- $index_entries = intval($sarr[($k +1)][1][1][1]);
- } elseif (($v[0] == '/') AND ($v[1] == 'Prev') AND (isset($sarr[($k +1)]) AND ($sarr[($k +1)][0] == 'numeric'))) {
- // get previous xref offset
- $prevxref = intval($sarr[($k +1)][1]);
- } elseif (($v[0] == '/') AND ($v[1] == 'W') AND (isset($sarr[($k +1)]))) {
- // number of bytes (in the decoded stream) of the corresponding field
- $wb = array();
- $wb[0] = intval($sarr[($k +1)][1][0][1]);
- $wb[1] = intval($sarr[($k +1)][1][1][1]);
- $wb[2] = intval($sarr[($k +1)][1][2][1]);
- } elseif (($v[0] == '/') AND ($v[1] == 'DecodeParms') AND (isset($sarr[($k +1)][1]))) {
- $decpar = $sarr[($k +1)][1];
- foreach ($decpar as $kdc => $vdc) {
- if (($vdc[0] == '/') AND ($vdc[1] == 'Columns') AND (isset($decpar[($kdc +1)]) AND ($decpar[($kdc +1)][0] == 'numeric'))) {
- $columns = intval($decpar[($kdc +1)][1]);
- } elseif (($vdc[0] == '/') AND ($vdc[1] == 'Predictor') AND (isset($decpar[($kdc +1)]) AND ($decpar[($kdc +1)][0] == 'numeric'))) {
- $predictor = intval($decpar[($kdc +1)][1]);
- }
- }
- } elseif ($filltrailer) {
- if (($v[0] == '/') AND ($v[1] == 'Size') AND (isset($sarr[($k +1)]) AND ($sarr[($k +1)][0] == 'numeric'))) {
- $xref['trailer']['size'] = $sarr[($k +1)][1];
- } elseif (($v[0] == '/') AND ($v[1] == 'Root') AND (isset($sarr[($k +1)]) AND ($sarr[($k +1)][0] == 'objref'))) {
- $xref['trailer']['root'] = $sarr[($k +1)][1];
- } elseif (($v[0] == '/') AND ($v[1] == 'Info') AND (isset($sarr[($k +1)]) AND ($sarr[($k +1)][0] == 'objref'))) {
- $xref['trailer']['info'] = $sarr[($k +1)][1];
- } elseif (($v[0] == '/') AND ($v[1] == 'Encrypt') AND (isset($sarr[($k +1)]) AND ($sarr[($k +1)][0] == 'objref'))) {
- $xref['trailer']['encrypt'] = $sarr[($k +1)][1];
- } elseif (($v[0] == '/') AND ($v[1] == 'ID') AND (isset($sarr[($k +1)]))) {
- $xref['trailer']['id'] = array();
- $xref['trailer']['id'][0] = $sarr[($k +1)][1][0][1];
- $xref['trailer']['id'][1] = $sarr[($k +1)][1][1][1];
- }
- }
- }
- // decode data
- if ($valid_crs AND isset($xrefcrs[1][3][0])) {
- // number of bytes in a row
- $rowlen = ($columns + 1);
- // convert the stream into an array of integers
- $sdata = unpack('C*', $xrefcrs[1][3][0]);
- // split the rows
- $sdata = array_chunk($sdata, $rowlen);
- // initialize decoded array
- $ddata = array();
- // initialize first row with zeros
- $prev_row = array_fill (0, $rowlen, 0);
- // for each row apply PNG unpredictor
- foreach ($sdata as $k => $row) {
- // initialize new row
- $ddata[$k] = array();
- // get PNG predictor value
- $predictor = (10 + $row[0]);
- // for each byte on the row
- for ($i=1; $i<=$columns; ++$i) {
- // new index
- $j = ($i - 1);
- $row_up = $prev_row[$j];
- if ($i == 1) {
- $row_left = 0;
- $row_upleft = 0;
- } else {
- $row_left = $row[($i - 1)];
- $row_upleft = $prev_row[($j - 1)];
- }
- switch ($predictor) {
- case 10: { // PNG prediction (on encoding, PNG None on all rows)
- $ddata[$k][$j] = $row[$i];
- break;
- }
- case 11: { // PNG prediction (on encoding, PNG Sub on all rows)
- $ddata[$k][$j] = (($row[$i] + $row_left) & 0xff);
- break;
- }
- case 12: { // PNG prediction (on encoding, PNG Up on all rows)
- $ddata[$k][$j] = (($row[$i] + $row_up) & 0xff);
- break;
- }
- case 13: { // PNG prediction (on encoding, PNG Average on all rows)
- $ddata[$k][$j] = (($row[$i] + (($row_left + $row_up) / 2)) & 0xff);
- break;
- }
- case 14: { // PNG prediction (on encoding, PNG Paeth on all rows)
- // initial estimate
- $p = ($row_left + $row_up - $row_upleft);
- // distances
- $pa = abs($p - $row_left);
- $pb = abs($p - $row_up);
- $pc = abs($p - $row_upleft);
- $pmin = min($pa, $pb, $pc);
- // return minimum distance
- switch ($pmin) {
- case $pa: {
- $ddata[$k][$j] = (($row[$i] + $row_left) & 0xff);
- break;
- }
- case $pb: {
- $ddata[$k][$j] = (($row[$i] + $row_up) & 0xff);
- break;
- }
- case $pc: {
- $ddata[$k][$j] = (($row[$i] + $row_upleft) & 0xff);
- break;
- }
- }
- break;
- }
- default: { // PNG prediction (on encoding, PNG optimum)
- $this->Error('Unknown PNG predictor');
- break;
- }
- }
- }
- $prev_row = $ddata[$k];
- } // end for each row
- // complete decoding
- $sdata = array();
- // for every row
- foreach ($ddata as $k => $row) {
- // initialize new row
- $sdata[$k] = array(0, 0, 0);
- if ($wb[0] == 0) {
- // default type field
- $sdata[$k][0] = 1;
- }
- $i = 0; // count bytes in the row
- // for every column
- for ($c = 0; $c < 3; ++$c) {
- // for every byte on the column
- for ($b = 0; $b < $wb[$c]; ++$b) {
- if (isset($row[$i])) {
- $sdata[$k][$c] += ($row[$i] << (($wb[$c] - 1 - $b) * 8));
- }
- ++$i;
- }
- }
- }
- $ddata = array();
- // fill xref
- if (isset($index_first)) {
- $obj_num = $index_first;
- } else {
- $obj_num = 0;
- }
- foreach ($sdata as $k => $row) {
- switch ($row[0]) {
- case 0: { // (f) linked list of free objects
- break;
- }
- case 1: { // (n) objects that are in use but are not compressed
- // create unique object index: [object number]_[generation number]
- $index = $obj_num.'_'.$row[2];
- // check if object already exist
- if (!isset($xref['xref'][$index])) {
- // store object offset position
- $xref['xref'][$index] = $row[1];
- }
- break;
- }
- case 2: { // compressed objects
- // $row[1] = object number of the object stream in which this object is stored
- // $row[2] = index of this object within the object stream
- $index = $row[1].'_0_'.$row[2];
- $xref['xref'][$index] = -1;
- break;
- }
- default: { // null objects
- break;
- }
- }
- ++$obj_num;
- }
- } // end decoding data
- if (isset($prevxref)) {
- // get previous xref
- $xref = $this->getXrefData($prevxref, $xref);
- }
- return $xref;
- }
-
- /**
- * Get object type, raw value and offset to next object
- * @param int $offset Object offset.
- * @return array containing object type, raw value and offset to next object
- * @protected
- * @since 1.0.000 (2011-06-20)
- */
- protected function getRawObject($offset=0) {
- $objtype = ''; // object type to be returned
- $objval = ''; // object value to be returned
- // skip initial white space chars: \x00 null (NUL), \x09 horizontal tab (HT), \x0A line feed (LF), \x0C form feed (FF), \x0D carriage return (CR), \x20 space (SP)
- $offset += strspn($this->pdfdata, "\x00\x09\x0a\x0c\x0d\x20", $offset);
- // get first char
- $char = $this->pdfdata[$offset];
- // get object type
- switch ($char) {
- case '%': { // \x25 PERCENT SIGN
- // skip comment and search for next token
- $next = strcspn($this->pdfdata, "\r\n", $offset);
- if ($next > 0) {
- $offset += $next;
- return $this->getRawObject($offset);
- }
- break;
- }
- case '/': { // \x2F SOLIDUS
- // name object
- $objtype = $char;
- ++$offset;
- if (preg_match('/^([^\x00\x09\x0a\x0c\x0d\x20\s\x28\x29\x3c\x3e\x5b\x5d\x7b\x7d\x2f\x25]+)/', substr($this->pdfdata, $offset, 256), $matches) == 1) {
- $objval = $matches[1]; // unescaped value
- $offset += strlen($objval);
- }
- break;
- }
- case '(': // \x28 LEFT PARENTHESIS
- case ')': { // \x29 RIGHT PARENTHESIS
- // literal string object
- $objtype = $char;
- ++$offset;
- $strpos = $offset;
- if ($char == '(') {
- $open_bracket = 1;
- while ($open_bracket > 0) {
- if (!isset($this->pdfdata[$strpos])) {
- break;
- }
- $ch = $this->pdfdata[$strpos];
- switch ($ch) {
- case '\\': { // REVERSE SOLIDUS (5Ch) (Backslash)
- // skip next character
- ++$strpos;
- break;
- }
- case '(': { // LEFT PARENHESIS (28h)
- ++$open_bracket;
- break;
- }
- case ')': { // RIGHT PARENTHESIS (29h)
- --$open_bracket;
- break;
- }
- }
- ++$strpos;
- }
- $objval = substr($this->pdfdata, $offset, ($strpos - $offset - 1));
- $offset = $strpos;
- }
- break;
- }
- case '[': // \x5B LEFT SQUARE BRACKET
- case ']': { // \x5D RIGHT SQUARE BRACKET
- // array object
- $objtype = $char;
- ++$offset;
- if ($char == '[') {
- // get array content
- $objval = array();
- do {
- // get element
- $element = $this->getRawObject($offset);
- $offset = $element[2];
- $objval[] = $element;
- } while ($element[0] != ']');
- // remove closing delimiter
- array_pop($objval);
- }
- break;
- }
- case '<': // \x3C LESS-THAN SIGN
- case '>': { // \x3E GREATER-THAN SIGN
- if (isset($this->pdfdata[($offset + 1)]) AND ($this->pdfdata[($offset + 1)] == $char)) {
- // dictionary object
- $objtype = $char.$char;
- $offset += 2;
- if ($char == '<') {
- // get array content
- $objval = array();
- do {
- // get element
- $element = $this->getRawObject($offset);
- $offset = $element[2];
- $objval[] = $element;
- } while ($element[0] != '>>');
- // remove closing delimiter
- array_pop($objval);
- }
- } else {
- // hexadecimal string object
- $objtype = $char;
- ++$offset;
- if (($char == '<') AND (preg_match('/^([0-9A-Fa-f\x09\x0a\x0c\x0d\x20]+)>/iU', substr($this->pdfdata, $offset), $matches) == 1)) {
- // remove white space characters
- $objval = strtr($matches[1], "\x09\x0a\x0c\x0d\x20", '');
- $offset += strlen($matches[0]);
- } elseif (($endpos = strpos($this->pdfdata, '>', $offset)) !== FALSE) {
- $offset = $endpos + 1;
- }
- }
- break;
- }
- default: {
- if (substr($this->pdfdata, $offset, 6) == 'endobj') {
- // indirect object
- $objtype = 'endobj';
- $offset += 6;
- } elseif (substr($this->pdfdata, $offset, 4) == 'null') {
- // null object
- $objtype = 'null';
- $offset += 4;
- $objval = 'null';
- } elseif (substr($this->pdfdata, $offset, 4) == 'true') {
- // boolean true object
- $objtype = 'boolean';
- $offset += 4;
- $objval = 'true';
- } elseif (substr($this->pdfdata, $offset, 5) == 'false') {
- // boolean false object
- $objtype = 'boolean';
- $offset += 5;
- $objval = 'false';
- } elseif (substr($this->pdfdata, $offset, 6) == 'stream') {
- // start stream object
- $objtype = 'stream';
- $offset += 6;
- if (preg_match('/^([\r]?[\n])/isU', substr($this->pdfdata, $offset), $matches) == 1) {
- $offset += strlen($matches[0]);
- if (preg_match('/(endstream)[\x09\x0a\x0c\x0d\x20]/isU', substr($this->pdfdata, $offset), $matches, PREG_OFFSET_CAPTURE) == 1) {
- $objval = substr($this->pdfdata, $offset, $matches[0][1]);
- $offset += $matches[1][1];
- }
- }
- } elseif (substr($this->pdfdata, $offset, 9) == 'endstream') {
- // end stream object
- $objtype = 'endstream';
- $offset += 9;
- } elseif (preg_match('/^([0-9]+)[\s]+([0-9]+)[\s]+R/iU', substr($this->pdfdata, $offset, 33), $matches) == 1) {
- // indirect object reference
- $objtype = 'objref';
- $offset += strlen($matches[0]);
- $objval = intval($matches[1]).'_'.intval($matches[2]);
- } elseif (preg_match('/^([0-9]+)[\s]+([0-9]+)[\s]+obj/iU', substr($this->pdfdata, $offset, 33), $matches) == 1) {
- // object start
- $objtype = 'obj';
- $objval = intval($matches[1]).'_'.intval($matches[2]);
- $offset += strlen ($matches[0]);
- } elseif (($numlen = strspn($this->pdfdata, '+-.0123456789', $offset)) > 0) {
- // numeric object
- $objtype = 'numeric';
- $objval = substr($this->pdfdata, $offset, $numlen);
- $offset += $numlen;
- }
- break;
- }
- }
- return array($objtype, $objval, $offset);
- }
-
- /**
- * Get content of indirect object.
- * @param string $obj_ref Object number and generation number separated by underscore character.
- * @param int $offset Object offset.
- * @param boolean $decoding If true decode streams.
- * @return array containing object data.
- * @protected
- * @since 1.0.000 (2011-05-24)
- */
- protected function getIndirectObject($obj_ref, $offset=0, $decoding=true) {
- $obj = explode('_', $obj_ref);
- if (($obj === false) OR (count($obj) != 2)) {
- $this->Error('Invalid object reference: '.$obj);
- return;
- }
- $objref = $obj[0].' '.$obj[1].' obj';
- // ignore leading zeros
- $offset += strspn($this->pdfdata, '0', $offset);
- if (strpos($this->pdfdata, $objref, $offset) != $offset) {
- // an indirect reference to an undefined object shall be considered a reference to the null object
- return array('null', 'null', $offset);
- }
- // starting position of object content
- $offset += strlen($objref);
- // get array of object content
- $objdata = array();
- $i = 0; // object main index
- do {
- $oldoffset = $offset;
- // get element
- $element = $this->getRawObject($offset);
- $offset = $element[2];
- // decode stream using stream's dictionary information
- if ($decoding AND ($element[0] == 'stream') AND (isset($objdata[($i - 1)][0])) AND ($objdata[($i - 1)][0] == '<<')) {
- $element[3] = $this->decodeStream($objdata[($i - 1)][1], $element[1]);
- }
- $objdata[$i] = $element;
- ++$i;
- } while (($element[0] != 'endobj') AND ($offset != $oldoffset));
- // remove closing delimiter
- array_pop($objdata);
- // return raw object content
- return $objdata;
- }
-
- /**
- * Get the content of object, resolving indect object reference if necessary.
- * @param string $obj Object value.
- * @return array containing object data.
- * @protected
- * @since 1.0.000 (2011-06-26)
- */
- protected function getObjectVal($obj) {
- if ($obj[0] == 'objref') {
- // reference to indirect object
- if (isset($this->objects[$obj[1]])) {
- // this object has been already parsed
- return $this->objects[$obj[1]];
- } elseif (isset($this->xref[$obj[1]])) {
- // parse new object
- $this->objects[$obj[1]] = $this->getIndirectObject($obj[1], $this->xref[$obj[1]], false);
- return $this->objects[$obj[1]];
- }
- }
- return $obj;
- }
-
- /**
- * Decode the specified stream.
- * @param array $sdic Stream's dictionary array.
- * @param string $stream Stream to decode.
- * @return array containing decoded stream data and remaining filters.
- * @protected
- * @since 1.0.000 (2011-06-22)
- */
- protected function decodeStream($sdic, $stream) {
- // get stream length and filters
- $slength = strlen($stream);
- if ($slength <= 0) {
- return array('', array());
- }
- $filters = array();
- foreach ($sdic as $k => $v) {
- if ($v[0] == '/') {
- if (($v[1] == 'Length') AND (isset($sdic[($k + 1)])) AND ($sdic[($k + 1)][0] == 'numeric')) {
- // get declared stream length
- $declength = intval($sdic[($k + 1)][1]);
- if ($declength < $slength) {
- $stream = substr($stream, 0, $declength);
- $slength = $declength;
- }
- } elseif (($v[1] == 'Filter') AND (isset($sdic[($k + 1)]))) {
- // resolve indirect object
- $objval = $this->getObjectVal($sdic[($k + 1)]);
- if ($objval[0] == '/') {
- // single filter
- $filters[] = $objval[1];
- } elseif ($objval[0] == '[') {
- // array of filters
- foreach ($objval[1] as $flt) {
- if ($flt[0] == '/') {
- $filters[] = $flt[1];
- }
- }
- }
- }
- }
- }
- // decode the stream
- $remaining_filters = array();
- foreach ($filters as $filter) {
- if (in_array($filter, TCPDF_FILTERS::getAvailableFilters())) {
- try {
- $stream = TCPDF_FILTERS::decodeFilter($filter, $stream);
- } catch (Exception $e) {
- $emsg = $e->getMessage();
- if ((($emsg[0] == '~') AND !$this->cfg['ignore_missing_filter_decoders'])
- OR (($emsg[0] != '~') AND !$this->cfg['ignore_filter_decoding_errors'])) {
- $this->Error($e->getMessage());
- }
- }
- } else {
- // add missing filter to array
- $remaining_filters[] = $filter;
- }
- }
- return array($stream, $remaining_filters);
- }
-
- /**
- * Throw an exception or print an error message and die if the K_TCPDF_PARSER_THROW_EXCEPTION_ERROR constant is set to true.
- * @param string $msg The error message
- * @public
- * @since 1.0.000 (2011-05-23)
- */
- public function Error($msg) {
- if ($this->cfg['die_for_errors']) {
- die('TCPDF_PARSER ERROR: '.$msg);
- } else {
- throw new Exception('TCPDF_PARSER ERROR: '.$msg);
- }
- }
-
-} // END OF TCPDF_PARSER CLASS
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/tools/tcpdf_addfont.php b/tools/tcpdf/tools/tcpdf_addfont.php
index 2937c7564..e1a2b32e5 100755
--- a/tools/tcpdf/tools/tcpdf_addfont.php
+++ b/tools/tcpdf/tools/tcpdf_addfont.php
@@ -7,9 +7,9 @@
// Last Update : 2013-08-05
// Authors : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
// Remi Collet
-// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
+// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
-// Copyright (C) 2011-2013 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2011-2026 Nicola Asuni - Tecnick.com LTD
//
// This file is part of TCPDF software library.
//