Version Notes
==== v1.7.2 ====
==== Improvements ====
- A timeout has been added for the AJAX calls of the delivery options. The timeout is set to 5 seconds.
- Monday delivery is clearly marked as Monday delivery in both the front- and backend now.
- Optimalisation of the ordergrid filter when the PostNL extension is being used in combination with the Adyen extension.
==== Bug Fixes ====
- An issue where Zend_PDF could show errors at specific combinations of characters.
- An issue where orders without a delivery date could show error messages in the ordergrid
- An issue during processing orders with delivery options in the OneStepCheckout.
- And issue where the PostNL payment methods were not visible for the Netherlands if the EPS shipping method wasn't selected.
- An issue where you could select a delivery location when this option was disabled.
- An issue where fatal errors could occur when the PostNL extension was being used in combination with the GoMage checkout.
- The zipcode check works in OneStepCheckout when no countries are selected now.
- Order won't be set at "Ship next day" when no delivery options are enabled.
- Added missing delivery options at the creation of shippments
- Shipments outside of the Netherlands won't give a delivery date anymore.
==== v1.7.1 ====
==== Improvements ====
- Refactored references to the TIG_POstNL_Helper_DeliveryOptions class' fee methods so they now call their counterparts in the TIG_PostNL_Helper_DeliveryOptions_Fee class
- Refactored the canUseDeliveryOptions method for GoMage LightCheckout to improve performance
==== Bug Fixes ====
- Fixed an issue with EPS label rotation where sometimes EPS combi-labels would be displayed as regular, non combi-labels.
- Fixed a problem where two config fields would throw E_STRICT_NOTICE level errors which in certain server configurations could lead to subsequent fatal errors when Magento unsuccessfully tried to log the errors.
- Fixed a problem where orders without a PostNL order entity could not be shipped due to a coding error
==== v1.7.0 ====
==== New Features ====
- Added support for sunday delivery.
- Added ability to charge a fee for sunday delivery.
==== Improvements ====
- Added compatibility with Picqer extension.
- Added the option to disable system.xml fields. This may be useful for other extensions that want to replace PostNL features.
- Updated CIF services used to CIF 1.14.
- Improved delivery date calculation to improve performance and stability.
- Updated Track & Trace URL format to the new PostNL standards
- Delivery options on Idev's OneStepCheckout will not immediately save the first available delivery option, rather than waiting for customer interaction
==== Bug Fixes ====
- Fixed an issue where the buspakje configuration modus check ignored the 'isbuspakjeactive' flag.
- Fixed an issue where configurable products never allowed delivery options.
- Fixed a rare problem that could cause an infinite loading spinner in GoMage LightCheckout when saving the selected delivery options.
- Fixed a problem where delivery dates and delivery time estimations are double-corrected for timezone differences.
- Fixed a problem where certain cron jobs would report that a directory is not readable, when actually it is just empty.
- Removed an unnecessary check when determining whether delivery options are available for the current quote.
==== v1.6.0 ====
==== New Features ====
- PostNL delivery options are now compatible with GoMage LightCheckout.
- PostNL MijnPakket login and Postcode check are now compatible with GoMage LightCheckout.
- It is now possible to use Magento's Soap API to confirm PostNL shipments, print shipping labels, get Track&Trace information and more!
- Added the option to not print a PostNL shipping label when printing the PostNL packing slip.
- Added a new uninstall button to safely uninstall the PostNL extension.
==== Improvements ====
- Updated the Google Maps integration to v3.19.
- Optimized error handling for certain CIF errors.
- Reverted the PostNL extension's Zend_Soap implementation to native PHP SoapClient for improved compatibility with HHVM.
- Improved the out-of-stock check used in PostNL delivery options to better match merchant expectations.
- Improved performance when printing packing slips or shipping labels.
- Malta is now considered an EPS destination.
- Added compatibility with Magento's SUPEE-6285 patch.
- Improved the address-splitting regular expression to better split house numbers from street names.
==== Bug Fixes ====
- Fixed an incorrect variable name in the upgradeNotification block.
- Fixed an issue where the mobile phone number popup would not appear when selecting a parcel dispenser location in onestepcheckout after a coupon had been added.
- Fixed a conflict with OneStepCheckout, where selecting a delivery date in the popup and then closing the popup (not by saving, but by using the 'x' icon), PostNL would be selected as delivery option but not the date, leaving the shipment with no shipping information.
- Fixed an issue where products on the PostNL packing slip would sometimes show 0 tax amount.
- The shipping date is now also shown on the packing slip when the show shipping method option is disabled.
- Fixed a javascript issue with PostNL COD when Delivery Options are disabled .
- Fixed several problems relating to a server's time zone configuration.
- Fixed an issue in the date renderers in Magento's backend where an unnecessary timezone correction resulted in incorrect dates being displayed.
- Fixed an issue where the attribute update cron would not be removed automatically when all products were updated.
- Fixed a problem with the temporary update crons when config cache is active.
- Fixed a problem where re-activating a quote after the order had been placed could lead to missing PostNL data.
- Fixed an issue where orders could incorrectly have an expected delivery date when no delivery option was selected.
- Fixed compatibility with payment extensions (e.g. Sisow) to prevent crashing when printing packing slip.
==== v1.5.3 ====
==== Bug Fixes ====
- Fixed an issue where in certain situations the delivery date may be equal to the shipping date for orders where no delivery date was chosen during checkout.
- Fixed an issue where all orders would be considered to be placed past the cut off time when the shipping duration was configured to be more than 1 day.
==== v1.5.2 ====
==== New Features ====
- Added compatibility with the Bpost Shipping Manager extension.
- Added the option to hide often shown warnings for the current admin user.
==== Improvements ====
- Added a warning to the configuration page when using the Postcode.NL extension as this extension may conflict with the PostNL extension/
- The PostNL postcode check functionality is now automatically disabled when using the Postcode.NL extension.
- Improved error handling when changes were made directly to the Magento database.
- The expected shipping and delivery dates are now also saved when no delivery option was selected during checkout.
- Several additional characters are now allowed in the packing slip item columns.
- Modified the way delivery options determine whether products are in stock in order to better match merchant expectations.
- Modified interface element for stock options for delivery options to better match merchant expectations.
- Modified code to prevent errors when the default cut-off time is missing.
- Improved error handling when changing a package shipment to a letter box shipment and the default letter box product option is unavailable.
- Added caching to the store time zones in the PostNL data helper.
- Added additional checks to prevent no extra cover amount from being sent for extra cover shipments.
- Fixed an incorrect English name for parcel dispensers.
- Removed the parcel dispenser label from the delivery options interface.
- Added a new notification to the order email to make it more clear that the customer has chosen to have their order delivered at a pick up location.
- Added a new notification to the billing and shipping address templated in OPC to make it more clear that the customer can select a pick up location in the shipping method step.
- The shipping address is now hidden in the progress bar on OPC when a post office address is selected.
==== Bug Fixes ====
- Fixed the split address lines detection on the PostNL config page. This should prevent incorrect warnings about split address lines from being shown.
- Fixed a bug where the chosen product option was not saved when using the create shipments mass action.
- Fixed the order confirm date renderer for orders that were placed late at night.
- A PostNL order is now also created for orders that do not have an associated delivery option. This prevents unexpected behaviour in the order grid when filtering on the confirm date column.
- Shipping labels are now oriented horizontally to prevent errors when printing directly from Chrome.
- Fixed an issue where the extra cover amount option was shown on the create shipment page when the 'is_buspakje' checkbox was checked by default and an extra product option was selected as default.
- Fixed an issue where buspakje was available for avond shipments.
- Fixed issue with not selecting delivery option in OSC would cause order date to be show as delivery date.
- Fixed an issue where the delivery and confirm dates were calculated using the server's time zone, rather than the UTC time zone.
- Fixed a possible notice due to a missing default value in the 'hour-minute' field renderer.
- Fixed an issue where filtering on the order type column would cause errors due to an incorrect join alias.
- Removed regex-based validation for delivery location names to prevent valid names from being blocked. Instead all tags are stripped from the name and the name is additionally escaped before processing.
- Fixed an issue which caused the Magento table rates title to be displayed for PostNL.
- Fixed an issue which caused the default letter box parcel option configuration setting to not be visible.
- Fixed an issue which could cause JS errors when there was an error while loading delivery options.
- Dots are now allowed in street addresses..
- Fixed a small typo in certain error messages.
- Fixed a small layout problem in the delivery options on small desktop screens.
- Fixed a bug where delivery options are not available when purchasing the same configurable product twice with different options.
- Fixed a warning message in the update attributes cron due to an undefined index.
- Fixed an issue where only come delivery options are available when the product attribute cron is still running.
==== v1.5.1 ====
==== New Features ====
- Added a parcel dispenser filter to the delivery options location picker.
==== Improvements ====
- Improved the available filter options for the shipping date columns in the order and shipment grids.
- Improved the way parcel dispenser pick-up locations are shown in the delivery options interface.
- The chosen pick up location is now shown in Idev's OneStepCheckout's order preview pop-up.
- It is no longer possible to configure the extension to use split address lines when there is only 1 address line available.
- When using split address lines it is no longer possible to use the same address line for multiple fields.
==== Bug fixes ====
- Fixed a problem that prevented PostNL Checkout orders from being placed.
- Removed an unnecessary css link in the default Magento theme.
- Phone numbers are no longer mandatory for PostNL post office locations.
==== v1.5.0 ====
==== New features ====
- Added support for printing return labels and tracking return shipments.
- You may now change the number of parcels in a shipment as long as the shipment has not yet been confirmed with PostNL.
- Added the option to show the chosen delivery options and post office pick-up location in transactional e-mails.
- Added a new mass action to the shipment grid to update the shipping status of selected shipments.
==== Improvements ====
- The extension has been updated to CIF 1.10 specifications.
- Cut-off times now take the store's time zone into account.
- Improved performance in the webshop's backend.
- Reduced the risk of extension conflicts in the order and shipment grids.
- It is now possible to print GlobalPack shipping labels even when one of the products in the shipment is missing a country of origin value.
- Address lines on the PostNL packing slip now have a maximum size of 33 characters (up from 20).
- The selected post office location is now shown on the sales/guest/form pages in Magento.
- The confirm and delivery dates of a shipment are now stored in the UTC time zone in the database.
- The selected post office location is now shown on the OnePage Checkout progress bar during checkout.
- The schedules of several cronjobs related to background processes have been redistributed over the day to reduce the load on the sever's cron during peak hours.
- VAT and discounts are now taken into account when calculating a shipment's base grandtotal amount.
- The extension will now shown a proper error message when the sever's PHP version is below the minimum version required by the PostNL extension (PHP 5.3.0).
- Decimal values are now allowed in the alternative standard product option field.
- Shipping labels will now be deleted from the database 30 days after the shipment has been delivered in order to give the consumer enough time to return the shipments without allowing the database to become too bloated.
==== Bug fixes ====
- The Track & Trace URL for orders which are shipped to post office locations has been modified to correctly use the postcode of the intended recipient.
- PostNL mass actions in the order grid will no longer affect non-PostNL mass actions which may have been added by other extensions.
- Postcodes are no longer required in order to create a Track & Trace URL.
- It is no longer possible to modify the confirmation of letter box parcel shipments without Track & Trace.
- An issue in Magento CE 1.6 and EE 1.11 has been resolved by no longer relying on the 'DEFAULT_DEST_STREET' constant value.
- MijnPakket login and delivery options are now also compatible with Idev's OneStepCheckout when the shipping address form has been disabled.
- Letter box parcel configuration options are now also applied to grouped products.
- The chosen delivery day is no longer shown on the customer's account page when delivery days have been disabled in the extension's configuration.
- Product's alternative shipping duration values are now taken into account when calculating the probable delivery day for orders when no specific delivery day was chosen during checkout.
- Tuesday is no longer shown as a valid delivery day when monday is not a shipping day and it is already past saturday.
==== v1.4.1 ====
==== New features ====
- Completely redesigned the configuration page of the extension!
- The extension's configuration page has now been split into a wizard-style menu for the core settings and a separate advanced options menu.
==== Improvements ====
- Added forwards compatibility to Magento 1.6 for advanced configuration field dependencies and other features that were introduced in Magento 1.7.
- Only stated address fee will now be hidden if the fee is less than 1 cent.
- Delivery days will now show 'as soon as possible' as the delivery time when no delivery days are available.
- The status update cron will now run 3 times a day. Before it was only 2 times a day.
- Added additional transactional email parameters to the track & trace email.
==== Bug fixes ====
- Only stated address option is no longer available for letter box orders.
- Removed two legacy references to css files from the frontend's layout XML file.
- Fixed a problem where the delivery option fee would not be reset if delivery options became unavailable during checkout.
- Fixed the delivery options responsive design in OneStepCheckout on older versions of Magento.
- Fixed an issue that prevented the order grid from being filtered on the order ID column.
- International track & trace URL's now use PostNL's new track & trace URL syntax. The old syntax is no longer supported by PostNL.
- Fixed a PHP warning level error that could occur if no additional options were saved for a PostNL order.
==== v1.4.0 ====
==== New features ====
- Added a new responsive design for PostNL delivery options.
- Added the option to specify on which days of the week the merchant will ship orders.
- Added the option to print packing slips directly from the order detail page.
- Added the option for customers to choose whether their order can be delivered to their neighbours in case they are not home during the delivery.
- Added a new PostNL rate type that allows merchants to finely tune their shipping costs.
- Added the option to charge a separate shipping rate for letter box parcels.
==== Improvements ====
- Modified a lot of heavy loading functionality in order to improve performance.
- PostNL Checkout will now check if an order is a letter box parcel before deciding whether PostNL Checkout should be available.
- In order to decrease server load during the extension's installation or upgrade, modifying product attributes is now handled by a temporary cron job.
- A comment will now be added to the order and shipment page when the PostNL track & trace email is sent.
- Evening delivery will no longer be available for letter box parcel orders.
==== Bug fixes ====
- FIxed the filter functionality of the order grid's confirm date column.
- Fixed a problem where the extra cover amount was missing when extra cover was used as a default shipping option.
- Fixed a problem where adding coupon codes in OneStepCheckout would disable delivery options.
- PostNL Checkout's weight calculation will no longer assume all items are weightless when a free shipping cart rule is active.
- Fixed a problem in the CMS page source model causing errors.
- Fixed a problem where tax calculation would not work as expected when tax calculation was set to before discount.
- Fixed a problem where it would be impossible to use the create shipment mass action when certain product options were disabled.
- Fixed problem where shipping to EPS countries could cause errors.
- Fixed an issue where the COD payment method would be hidden for regular shipments.
- Fixed an issue where the print labels mass action would also confirm the shipment
- Adding a new address in multi-address checkout will no longer cause errors when postcode check has been enabled.
- Fixed a bug in the updatePostnlOrder observer that caused errors when ordering virtual orders.
==== v1.3.1 ====
==== Bug fixes ====
- Confirm dates will no longer be shown as always being in the future.
- Added additional checks to prevent deleted Magento orders and shipments from causing errors.
- Prevented VAT amounts from being shown twice on the checkout page.
- It is no longer impossible to create multi-parcel shipments when 'letter box calculation mode' is set to automatic.
- Prevented COD fees from causing errors on the invoice page in the backend.
==== v1.3.0 ====
==== New features ====
- Added the option to ship orders as letter box parcels. Letter box parcels are shipped using the regular mail service and can be shipped at a reduced rate. It's possible to let the PostNL extension determine when an order qualifies as a letter box parcel or to decide this manually when creating a shipment in Magento.
- Added a new PostNL COD payment method that is fully integrated in the other PostNL services offered by the extension. It's possible to charge an additional fee to customers for using PostNL COD. It's also possible to have the extension automatically invoice COD orders once they have been delivered to the customer.
- Added a new PostNL packing slip. This packing slip may contain the PostNL shipping label, allowing you to use the packing slip as the shipping label for the parcel.
- Added the option to enable or disable delivery options at the product level.
- Added the ability to convert existing shipments to a letter box parcel or to a regular parcel as long as they have not been received by PostNL.
- Added the ability to change the selected shipping option for a shipment as long as it has not yet been received by PostNL.
- Added the option to use additional shipping methods for PostNL.
- Added the option to create a shipment, confirm it and print it's shipping labels for an order straight from the order grid in a single click.
==== Improvements ====
- It's now possible to enable or disable time frames separately from delivery days.
- You can now specify the cut-off time in minutes as well as hours.
- You can now view an order's confirm date, confirm status and shipping phase in the order grid.
- Additional information regarding the chosen delivery option is now shown on the order detail page.
- Added a button to download all PostNL debug log files to the PostNL configuration page.
- The 'create shipments' massaction interface has been modified so that only valid options are displayed.
- Errors that occur whilst processing multiple shipments or orders will no longer stop the entire process. Instead the remaining orders and shipments will be processed and an error message specifying which orders or shipments caused an error will be displayed afterwards.
- The first and last name fields are no longer mandatory for the sender's address fields in the PostNL configuration.
- Spaces are now allowed in postcodes.
==== Bug fixes ====
- Deleting orders from Magento should no longer cause errors when processing PostNL shipments.
- The PostNL shipping method will no longer be selected by default.
- Greece will now be processed with EPS, instead of GlobalPack.
- Upgrade and install scripts will now check if certain columns and attributes exist before modifying them.
- The progress bar on the Onepage Checkout page will now correctly update the shipping costs when the customer has chosen a delivery option that charges an additional fee.
- Creating shipments for which no default shipping option is selected will no longer cause errors.
==== v1.2.2 ====
==== New features ====
- Added the option to send a copy of the track & trace email to a specified email address.
==== Improvements ====
- Performance of the entire extension has been improved. The extension will now attempt to cache several configuration values.
- Label printing will now always follow the 'label size' configuration setting.
==== Bug fixes ====
- Fixed several small html errors in the track & trace email template.
- Fixed an SQL error that could occur when filtering the 'store' column in the order and shipment grids.
==== v1.2.1 ====
==== Release highlights ====
- The extension now fully supports Magento 1.9 and 1.14!
==== Minor improvements ====
- Added additional checks to prevent errors when Magento's layout has been altered or PostNL's layout has not been uploaded properly.
- Added additional compatibility enhancements for MultiSafePay and other PSP extensions.
- Improved several minor texts and translations.
==== Bug fixes ====
- Fixed an issue that prevented MijnPakket login data from being cached.
- Fixed an issue where using PostNL-only features on non-PostNL shipments would cause an error.
- Fixed an issue where PostNL's feed messages would be loaded in the wrong order.
- Fixed an issue where several notifications would be added to Magento when installing an unsupported version of Magento with the PostNL extension.
- Fixed an issue with EPS comb-labels. EPS combi-labels were rotated by 90 degrees, causing overlapping issues with other labels being printed.
==== v1.2.0 =====
==== New features ====
- Added delivery options to the checkout flow. Customers can now choose where, when and how they want their order shipped when choosing their preferred shipping method.
- Added support for evening delivery, early pickup locations and parcel dispenser locations.
- Added Dutch postcode validation support.
- Added the option to create a parcelware export csv file directly from the Magento backend.
- Added a MijnPakket login feature. Customers who have a MijnPakket account can use this feature to automatically fill in their preferred billing and shipping address.
==== Minor improvements ====
- Refactored the label printing functionality. Shipping labels will now be opened in a separate window from where they may be printed or downloaded.
- Added the option to select where on an A4 page the shipping labels will start printing. This allows you to re-use partially used sticker-sheets.
- Added many new customization options for the shipment grid in the Magento backend.
- Added the ability to view and edit a chosen post office delivery address from the Magento backend.
- Added the option to only show the PostNL Checkout feature to customers who have a MijnPakket account.
- Refactored many sections of the source code to improve readability and extensibility.
- Moved several configuration settings.
- Merged the 'test/live mode' settings of PostNl Checkout and Label Printing & Confirming functionality. There is now a single option to set the entire extension to test or live mode.
- Added the option to upload separate csv files for the PostNL shipping method in 'table rate' configuration.
==== Bug fixes ====
- Fixed an issue where it was not possible to choose to only manually send track & trace information.
- Fixed several typos and translation errors.
==== v1.1.5 =====
==== Bug fixes ====
- Fixed a problem with account validation only using test mode account credentials
- Made a minor security improvement to the notification system.
- Fixed an issue where shipments could not be confirmed if the shipping address did not have an email address.
- Fixed an issue where PostNl Checkout would incorrectly identify a product as being out of stock.
- Fixed an issue where for some shops PostNl Checkout would not function due to incorrect usage of https in an http environment.
==== v1.1.4 =====
==== New features ====
- Added a default test account to the extension. New installation will automatically have a PostNL test account pre-configured.
- Added the option to undo a confirmation as long as the shipment has not been received by PostNL.
- Added the option to delete shipping labels. This allows you to correct an address after a shipping label has been printed. Before this change if you noticed an error in the address after you had already printed a shipping label, you had to place en entire new order to correct it. Now you can simply delete the shipping label, edit the address and print a new shipping label with the new address.
==== Minor change ====
- The validate settings button in the extension’s configuration page now also validates settings while the extension is set to test mode.
- Removed the 'EU Pack Standard (Belgium only, no signature)' product option. If you use this option, please contact the Total Internet Group servicedesk.
- The extension's test mode is now available by default. In earlier versions you had to allow test mode through a setting under advanced options.
- When a confirmation expires, the barcode's track & trace link will now also be removed.
- Improved various texts and translations.
==== Bug fixes ====
- Solved an issue where certain configurations of the PostNL shipping method would only appear if the Magento tablerates shipping method was also active.
- Solved an issue where filtering the order and shipment grids in the Magento backend on certain columns would cause an error.
- Solved an issue where the shipment status cron would stop as soon as it encountered an error, rather than continue processing the remaining shipments.
- Solved an issue where you could not confirm a shipment without a barcode due to process locking when developer mode is active.
- Solved issue in Safari where labels would be printed as .pdf.html, rather than just .pdf files.
==== v1.1.3 ====
- FIxed an issue with the extension's activation procedure.
==== v1.1.2 ====
- Updated manual.
==== v1.1.1 ====
- Fixed issue where filtering the first column of the shipment grid could cause errors.
- Removed PHP extension dependencies from the PostNL extension packages. Magento connect would sometimes falsely report a PHP extension as missing preventing the PostNL extension from being installed.
==== v1.1.0 ====
- First public release.
==== v1.0.8 ====
- Improved compatibility with Magento 1.6 and 1.11.
==== v1.0.7 ====
- Improved configuration fields.
- Improved translations.
==== v1.0.6 ====
- Improved shipment grid interface. It shoulod now be more clear which shipments have been confirmed and when they should be handed over to PostNL.
- Improved PostNL Checkout payment method handling. The Checkout summary page should now remember your chosen bank when you attempt to pay using iDEAL. 100% support for all payment methods is not guaranteed.
==== v1.0.5 ====
- Several bug fixes.
- Improved configuration interface.
==== v1.0.4 ====
- Several minor bug fixes.
- Improved Dutch translations.
- Added additional information to several fields in system/config.
==== v1.0.3 ====
- Several bug fixes. Including an issue preventing the extension from functioning properly with the compiler active.
- Several improvements to the Dutch translations.
- Improved the extension's system > config interface
- Added the Klarna payment method to PostNL Checkout
==== v1.0.2 ====
- A large number of bug fixes and general improvements
- Improved error handling. Almost all errors will now automatically provide you with a link where you can find more information and a possible solution.
==== v1.0.1 ====
- Added a filter to the possible product options you may select, based on the selected orders when mass-creating shipments from the order grid.
- Improved several translations.
- Fixed several minor bugs.
==== v1.0.0 ====
This is the initial beta release of the extension. If you have any questions, please contact the Total Internet Group Servicedesk
Download this release
Release Info
| Developer | TIG |
| Extension | tig_postnl |
| Version | 1.7.2 |
| Comparing to | |
| See all releases | |
Code changes from version 1.7.1 to 1.7.2
- app/code/community/TIG/PostNL/Block/Adminhtml/Sales/Order/Shipment/View/DeliveryOptions.php +3 -0
- app/code/community/TIG/PostNL/Block/Adminhtml/Sales/Order/View/DeliveryOptions.php +4 -1
- app/code/community/TIG/PostNL/Block/Adminhtml/Widget/Grid/Column/Renderer/DeliveryDate.php +6 -0
- app/code/community/TIG/PostNL/Block/Adminhtml/Widget/Grid/Column/Renderer/Type/Abstract.php +29 -5
- app/code/community/TIG/PostNL/Block/DeliveryOptions/Checkout/DeliveryOptions.php +19 -0
- app/code/community/TIG/PostNL/Helper/Carrier.php +1 -1
- app/code/community/TIG/PostNL/Helper/Checkout.php +1 -1
- app/code/community/TIG/PostNL/Helper/Cif.php +49 -1
- app/code/community/TIG/PostNL/Helper/Data.php +35 -1
- app/code/community/TIG/PostNL/Helper/Date.php +65 -7
- app/code/community/TIG/PostNL/Helper/DeliveryOptions.php +70 -14
- app/code/community/TIG/PostNL/Model/Admin/Logging/Handler/Postnl.php +10 -0
- app/code/community/TIG/PostNL/Model/Admin/Logging/Observer.php +6 -0
- app/code/community/TIG/PostNL/Model/Adminhtml/Observer/OrderGrid.php +50 -4
- app/code/community/TIG/PostNL/Model/Adminhtml/Observer/ShipmentGrid.php +16 -9
- app/code/community/TIG/PostNL/Model/Carrier/Postnl.php +7 -7
- app/code/community/TIG/PostNL/Model/Core/Cif.php +1 -1
- app/code/community/TIG/PostNL/Model/Core/Label.php +88 -62
- app/code/community/TIG/PostNL/Model/Core/PackingSlip.php +29 -10
- app/code/community/TIG/PostNL/Model/Core/Shipment.php +58 -7
- app/code/community/TIG/PostNL/Model/Core/Shipment/Label.php +52 -0
- app/code/community/TIG/PostNL/Model/Core/Shipment/Process.php +1 -1
- app/code/community/TIG/PostNL/Model/Core/System/Config/Source/AllProductOptions.php +7 -3
- app/code/community/TIG/PostNL/Model/Core/System/Config/Source/ProductOptions/Abstract.php +5 -1
- app/code/community/TIG/PostNL/Model/Core/System/Config/Source/ShippingDurationDays.php +82 -0
- app/code/community/TIG/PostNL/Model/Core/System/Config/Source/StandardProductOptions.php +3 -3
- app/code/community/TIG/PostNL/Model/DeliveryOptions/Observer/UpdatePostnlOrder.php +1 -1
- app/code/community/TIG/PostNL/Model/Payment/Cod.php +2 -5
- app/code/community/TIG/PostNL/Model/Resource/Setup.php +2 -0
- app/code/community/TIG/PostNL/controllers/DeliveryOptionsController.php +1 -0
- app/code/community/TIG/PostNL/data/postnl_setup/data-install-1.7.2.php +159 -0
- app/code/community/TIG/PostNL/data/postnl_setup/data-upgrade-1.7.1-1.7.2.php +53 -0
- app/code/community/TIG/PostNL/etc/config.xml +4 -12
- app/code/community/TIG/PostNL/etc/jstranslator.xml +3 -0
- app/code/community/TIG/PostNL/etc/logging.xml +58 -58
- app/code/community/TIG/PostNL/etc/system.xml +22 -3
- app/design/adminhtml/default/default/template/TIG/PostNL/sales/order/shipment/create/shipment_options.phtml +13 -1
- app/design/adminhtml/default/default/template/TIG/PostNL/sales/order/shipment/view/delivery_options.phtml +9 -6
- app/design/adminhtml/default/default/template/TIG/PostNL/sales/order/view/delivery_options.phtml +7 -5
- app/design/frontend/base/default/template/TIG/PostNL/address_validation/onestepcheckout/postcode_check.phtml +19 -10
- app/design/frontend/base/default/template/TIG/PostNL/delivery_options/gomage_checkout/available.phtml +1 -0
- app/design/frontend/base/default/template/TIG/PostNL/delivery_options/gomage_checkout/deliveryoptions.phtml +6 -2
- app/design/frontend/base/default/template/TIG/PostNL/delivery_options/onepage/deliveryoptions.phtml +5 -1
- app/design/frontend/base/default/template/TIG/PostNL/delivery_options/onestepcheckout/deliveryoptions.phtml +6 -2
- app/design/frontend/base/default/template/TIG/PostNL/payment/checkout/form/cod.phtml +5 -0
- app/locale/en_US/TIG_PostNL.csv +21 -9
- app/locale/en_US/template/email/TIG/PostNL/return_label.html +1 -1
- app/locale/en_US/template/email/TIG/PostNL/track_and_trace.html +1 -1
- app/locale/nl_NL/TIG_PostNL.csv +40 -11
- app/locale/nl_NL/template/email/TIG/PostNL/return_label.html +1 -1
- package.xml +23 -5
- skin/frontend/base/default/js/TIG/PostNL/deliveryOptions.js +41 -5
- skin/frontend/base/default/js/TIG/PostNL/postcodecheck.js +18 -12
app/code/community/TIG/PostNL/Block/Adminhtml/Sales/Order/Shipment/View/DeliveryOptions.php
CHANGED
|
@@ -210,6 +210,9 @@ class TIG_PostNL_Block_Adminhtml_Sales_Order_Shipment_View_DeliveryOptions
|
|
| 210 |
case $postnlShipment::SHIPMENT_TYPE_SUNDAY:
|
| 211 |
$shipmentType = $this->__('Sunday Delivery');
|
| 212 |
break;
|
|
|
|
|
|
|
|
|
|
| 213 |
}
|
| 214 |
|
| 215 |
return $shipmentType;
|
| 210 |
case $postnlShipment::SHIPMENT_TYPE_SUNDAY:
|
| 211 |
$shipmentType = $this->__('Sunday Delivery');
|
| 212 |
break;
|
| 213 |
+
case $postnlShipment::SHIPMENT_TYPE_MONDAY:
|
| 214 |
+
$shipmentType = $this->__('Monday Delivery');
|
| 215 |
+
break;
|
| 216 |
}
|
| 217 |
|
| 218 |
return $shipmentType;
|
app/code/community/TIG/PostNL/Block/Adminhtml/Sales/Order/View/DeliveryOptions.php
CHANGED
|
@@ -129,6 +129,9 @@ class TIG_PostNL_Block_Adminhtml_Sales_Order_View_DeliveryOptions extends TIG_Po
|
|
| 129 |
case 'Sunday':
|
| 130 |
$shipmentType = $this->__('Sunday Delivery');
|
| 131 |
break;
|
|
|
|
|
|
|
|
|
|
| 132 |
case 'Overdag':
|
| 133 |
if ($countryId != $domesticCountry) {
|
| 134 |
continue;
|
|
@@ -141,7 +144,7 @@ class TIG_PostNL_Block_Adminhtml_Sales_Order_View_DeliveryOptions extends TIG_Po
|
|
| 141 |
return $shipmentType;
|
| 142 |
}
|
| 143 |
|
| 144 |
-
if (
|
| 145 |
$shipmentType = $this->__('Domestic');
|
| 146 |
|
| 147 |
return $shipmentType;
|
| 129 |
case 'Sunday':
|
| 130 |
$shipmentType = $this->__('Sunday Delivery');
|
| 131 |
break;
|
| 132 |
+
case 'Monday':
|
| 133 |
+
$shipmentType = $this->__('Monday Delivery');
|
| 134 |
+
break;
|
| 135 |
case 'Overdag':
|
| 136 |
if ($countryId != $domesticCountry) {
|
| 137 |
continue;
|
| 144 |
return $shipmentType;
|
| 145 |
}
|
| 146 |
|
| 147 |
+
if ($countryId == $domesticCountry) {
|
| 148 |
$shipmentType = $this->__('Domestic');
|
| 149 |
|
| 150 |
return $shipmentType;
|
app/code/community/TIG/PostNL/Block/Adminhtml/Widget/Grid/Column/Renderer/DeliveryDate.php
CHANGED
|
@@ -44,6 +44,7 @@ class TIG_PostNL_Block_Adminhtml_Widget_Grid_Column_Renderer_DeliveryDate
|
|
| 44 |
*/
|
| 45 |
const SHIPPING_METHOD_COLUMN = 'shipping_method';
|
| 46 |
const CONFIRM_DATE_COLUMN = 'confirm_date';
|
|
|
|
| 47 |
|
| 48 |
/**
|
| 49 |
* Renders column.
|
|
@@ -59,6 +60,11 @@ class TIG_PostNL_Block_Adminhtml_Widget_Grid_Column_Renderer_DeliveryDate
|
|
| 59 |
return '';
|
| 60 |
}
|
| 61 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 62 |
$value = $row->getData($this->getColumn()->getIndex());
|
| 63 |
|
| 64 |
/**
|
| 44 |
*/
|
| 45 |
const SHIPPING_METHOD_COLUMN = 'shipping_method';
|
| 46 |
const CONFIRM_DATE_COLUMN = 'confirm_date';
|
| 47 |
+
const COUNTRY_ID_COLUMN = 'country_id';
|
| 48 |
|
| 49 |
/**
|
| 50 |
* Renders column.
|
| 60 |
return '';
|
| 61 |
}
|
| 62 |
|
| 63 |
+
$domesticCountry = Mage::helper('postnl')->getDomesticCountry();
|
| 64 |
+
if ($row->getData(self::COUNTRY_ID_COLUMN) != $domesticCountry) {
|
| 65 |
+
return Mage::helper('postnl')->__('N/A');
|
| 66 |
+
}
|
| 67 |
+
|
| 68 |
$value = $row->getData($this->getColumn()->getIndex());
|
| 69 |
|
| 70 |
/**
|
app/code/community/TIG/PostNL/Block/Adminhtml/Widget/Grid/Column/Renderer/Type/Abstract.php
CHANGED
|
@@ -119,6 +119,9 @@ class TIG_PostNL_Block_Adminhtml_Widget_Grid_Column_Renderer_Type_Abstract
|
|
| 119 |
case 'sunday':
|
| 120 |
$label = $helper->__('Sunday Delivery');
|
| 121 |
break;
|
|
|
|
|
|
|
|
|
|
| 122 |
}
|
| 123 |
|
| 124 |
$renderedValue = "<b id='postnl-shipmenttype-{$row->getId()}' data-product-type='{$type}'>{$label}</b>";
|
|
@@ -190,6 +193,8 @@ class TIG_PostNL_Block_Adminhtml_Widget_Grid_Column_Renderer_Type_Abstract
|
|
| 190 |
return $this->_getPgeRenderedValue($row);
|
| 191 |
} elseif ($optionType == 'Sunday') {
|
| 192 |
return $this->_getSundayRenderedValue($row);
|
|
|
|
|
|
|
| 193 |
} elseif ($row->getData(self::IS_PAKKETAUTOMAAT_COLUMN)) {
|
| 194 |
return $this->_getPaRenderedValue($row);
|
| 195 |
} elseif ($row->getData(self::IS_PAKJE_GEMAK_COLUMN)) {
|
|
@@ -335,20 +340,39 @@ class TIG_PostNL_Block_Adminhtml_Widget_Grid_Column_Renderer_Type_Abstract
|
|
| 335 |
return $renderedValue;
|
| 336 |
}
|
| 337 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 338 |
/**
|
| 339 |
* Render this column for a domestic shipment.
|
| 340 |
*
|
| 341 |
* @param Varien_Object $row
|
| 342 |
* @param string $destination
|
|
|
|
| 343 |
*
|
| 344 |
* @return string
|
| 345 |
*/
|
| 346 |
-
protected function _getDomesticRenderedValue(Varien_Object $row, $destination)
|
| 347 |
{
|
| 348 |
$helper = Mage::helper('postnl');
|
| 349 |
$deliveryOptionsHelper = Mage::helper('postnl/deliveryOptions');
|
| 350 |
|
| 351 |
-
|
|
|
|
|
|
|
| 352 |
$type = 'domestic';
|
| 353 |
|
| 354 |
$isCod = $this->_isCod($row);
|
|
@@ -365,7 +389,7 @@ class TIG_PostNL_Block_Adminhtml_Widget_Grid_Column_Renderer_Type_Abstract
|
|
| 365 |
$deliveryDate = $row->getData(self::DELIVERY_DATE_COLUMN);
|
| 366 |
$deliveryDate = DateTime::createFromFormat('Y-m-d H:i:s', $deliveryDate, new DateTimeZone('UTC'));
|
| 367 |
|
| 368 |
-
if ($deliveryDate->format('N') !== '0' && $deliveryDate->format('N') !== '1') {
|
| 369 |
$label = $helper->__('Letter Box Parcel');
|
| 370 |
$type = 'buspakje';
|
| 371 |
|
|
@@ -388,7 +412,7 @@ class TIG_PostNL_Block_Adminhtml_Widget_Grid_Column_Renderer_Type_Abstract
|
|
| 388 |
$deliveryDate = $row->getData(self::DELIVERY_DATE_COLUMN);
|
| 389 |
$deliveryDate = DateTime::createFromFormat('Y-m-d H:i:s', $deliveryDate, new DateTimeZone('UTC'));
|
| 390 |
|
| 391 |
-
if ($deliveryDate->format('N') !== '0' && $deliveryDate->format('N') !== '1') {
|
| 392 |
$renderedValue .= '<br /><em>(' . $helper->__('possibly letter box parcel') . ')</em>';
|
| 393 |
}
|
| 394 |
}
|
|
@@ -483,4 +507,4 @@ class TIG_PostNL_Block_Adminhtml_Widget_Grid_Column_Renderer_Type_Abstract
|
|
| 483 |
|
| 484 |
return $html;
|
| 485 |
}
|
| 486 |
-
}
|
| 119 |
case 'sunday':
|
| 120 |
$label = $helper->__('Sunday Delivery');
|
| 121 |
break;
|
| 122 |
+
case 'monday':
|
| 123 |
+
$label = $helper->__('Monday Delivery');
|
| 124 |
+
break;
|
| 125 |
}
|
| 126 |
|
| 127 |
$renderedValue = "<b id='postnl-shipmenttype-{$row->getId()}' data-product-type='{$type}'>{$label}</b>";
|
| 193 |
return $this->_getPgeRenderedValue($row);
|
| 194 |
} elseif ($optionType == 'Sunday') {
|
| 195 |
return $this->_getSundayRenderedValue($row);
|
| 196 |
+
} elseif ($optionType == 'Monday') {
|
| 197 |
+
return $this->_getMondayRenderedValue($row, $value);
|
| 198 |
} elseif ($row->getData(self::IS_PAKKETAUTOMAAT_COLUMN)) {
|
| 199 |
return $this->_getPaRenderedValue($row);
|
| 200 |
} elseif ($row->getData(self::IS_PAKJE_GEMAK_COLUMN)) {
|
| 340 |
return $renderedValue;
|
| 341 |
}
|
| 342 |
|
| 343 |
+
/**
|
| 344 |
+
* Render this column for monday shipments.
|
| 345 |
+
*
|
| 346 |
+
* @param Varien_Object $row
|
| 347 |
+
* @param $destination
|
| 348 |
+
*
|
| 349 |
+
* @return string
|
| 350 |
+
*/
|
| 351 |
+
protected function _getMondayRenderedValue(Varien_Object $row, $destination)
|
| 352 |
+
{
|
| 353 |
+
$helper = Mage::helper('postnl');
|
| 354 |
+
|
| 355 |
+
$label = $helper->__('Monday Delivery');
|
| 356 |
+
return $this->_getDomesticRenderedValue($row, $destination, $label);
|
| 357 |
+
}
|
| 358 |
+
|
| 359 |
/**
|
| 360 |
* Render this column for a domestic shipment.
|
| 361 |
*
|
| 362 |
* @param Varien_Object $row
|
| 363 |
* @param string $destination
|
| 364 |
+
* @param null|string $label
|
| 365 |
*
|
| 366 |
* @return string
|
| 367 |
*/
|
| 368 |
+
protected function _getDomesticRenderedValue(Varien_Object $row, $destination, $label = null)
|
| 369 |
{
|
| 370 |
$helper = Mage::helper('postnl');
|
| 371 |
$deliveryOptionsHelper = Mage::helper('postnl/deliveryOptions');
|
| 372 |
|
| 373 |
+
if (!$label) {
|
| 374 |
+
$label = $helper->__('Domestic');
|
| 375 |
+
}
|
| 376 |
$type = 'domestic';
|
| 377 |
|
| 378 |
$isCod = $this->_isCod($row);
|
| 389 |
$deliveryDate = $row->getData(self::DELIVERY_DATE_COLUMN);
|
| 390 |
$deliveryDate = DateTime::createFromFormat('Y-m-d H:i:s', $deliveryDate, new DateTimeZone('UTC'));
|
| 391 |
|
| 392 |
+
if ($deliveryDate && $deliveryDate->format('N') !== '0' && $deliveryDate->format('N') !== '1') {
|
| 393 |
$label = $helper->__('Letter Box Parcel');
|
| 394 |
$type = 'buspakje';
|
| 395 |
|
| 412 |
$deliveryDate = $row->getData(self::DELIVERY_DATE_COLUMN);
|
| 413 |
$deliveryDate = DateTime::createFromFormat('Y-m-d H:i:s', $deliveryDate, new DateTimeZone('UTC'));
|
| 414 |
|
| 415 |
+
if ($deliveryDate && $deliveryDate->format('N') !== '0' && $deliveryDate->format('N') !== '1') {
|
| 416 |
$renderedValue .= '<br /><em>(' . $helper->__('possibly letter box parcel') . ')</em>';
|
| 417 |
}
|
| 418 |
}
|
| 507 |
|
| 508 |
return $html;
|
| 509 |
}
|
| 510 |
+
}
|
app/code/community/TIG/PostNL/Block/DeliveryOptions/Checkout/DeliveryOptions.php
CHANGED
|
@@ -67,6 +67,11 @@ class TIG_PostNL_Block_DeliveryOptions_Checkout_DeliveryOptions extends TIG_Post
|
|
| 67 |
*/
|
| 68 |
const XPATH_STATED_ADDRESS_ONLY_CHECKED = 'postnl/delivery_options/stated_address_only_checked';
|
| 69 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 70 |
/**
|
| 71 |
* Shipping method code used by PostNL matrix rate.
|
| 72 |
*/
|
|
@@ -827,6 +832,20 @@ class TIG_PostNL_Block_DeliveryOptions_Checkout_DeliveryOptions extends TIG_Post
|
|
| 827 |
return false;
|
| 828 |
}
|
| 829 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 830 |
/**
|
| 831 |
* get the first possible delivery date from PostNL.
|
| 832 |
*
|
| 67 |
*/
|
| 68 |
const XPATH_STATED_ADDRESS_ONLY_CHECKED = 'postnl/delivery_options/stated_address_only_checked';
|
| 69 |
|
| 70 |
+
/**
|
| 71 |
+
* Xpath to the 'timeout' setting.
|
| 72 |
+
*/
|
| 73 |
+
const XPATH_DELIVERY_OPTIONS_TIMEOUT = 'postnl/delivery_options/ajax_timeout';
|
| 74 |
+
|
| 75 |
/**
|
| 76 |
* Shipping method code used by PostNL matrix rate.
|
| 77 |
*/
|
| 832 |
return false;
|
| 833 |
}
|
| 834 |
|
| 835 |
+
/**
|
| 836 |
+
* @return int
|
| 837 |
+
*/
|
| 838 |
+
public function getDeliveryOptionsAjaxTimeout()
|
| 839 |
+
{
|
| 840 |
+
$timeout = (int) Mage::getStoreConfig(self::XPATH_DELIVERY_OPTIONS_TIMEOUT, Mage::app()->getStore()->getid());
|
| 841 |
+
|
| 842 |
+
if ($timeout < 1) {
|
| 843 |
+
$timeout = 5;
|
| 844 |
+
}
|
| 845 |
+
|
| 846 |
+
return $timeout;
|
| 847 |
+
}
|
| 848 |
+
|
| 849 |
/**
|
| 850 |
* get the first possible delivery date from PostNL.
|
| 851 |
*
|
app/code/community/TIG/PostNL/Helper/Carrier.php
CHANGED
|
@@ -191,7 +191,7 @@ class TIG_PostNL_Helper_Carrier extends TIG_PostNL_Helper_Data
|
|
| 191 |
*/
|
| 192 |
public function getPostnlShippingMethod()
|
| 193 |
{
|
| 194 |
-
trigger_error('This method is deprecated and may be removed in the future.',
|
| 195 |
return $this->getCurrentPostnlShippingMethod();
|
| 196 |
}
|
| 197 |
|
| 191 |
*/
|
| 192 |
public function getPostnlShippingMethod()
|
| 193 |
{
|
| 194 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_DEPRECATED);
|
| 195 |
return $this->getCurrentPostnlShippingMethod();
|
| 196 |
}
|
| 197 |
|
app/code/community/TIG/PostNL/Helper/Checkout.php
CHANGED
|
@@ -331,7 +331,7 @@ class TIG_PostNL_Helper_Checkout extends TIG_PostNL_Helper_Data
|
|
| 331 |
*/
|
| 332 |
public function quoteIsLetter($quoteItems, $storeId = null)
|
| 333 |
{
|
| 334 |
-
trigger_error('This method is deprecated and may be removed in the future.',
|
| 335 |
if ($quoteItems instanceof Mage_Sales_Model_Quote) {
|
| 336 |
$quoteItems = $quoteItems->getAllItems();
|
| 337 |
}
|
| 331 |
*/
|
| 332 |
public function quoteIsLetter($quoteItems, $storeId = null)
|
| 333 |
{
|
| 334 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_DEPRECATED);
|
| 335 |
if ($quoteItems instanceof Mage_Sales_Model_Quote) {
|
| 336 |
$quoteItems = $quoteItems->getAllItems();
|
| 337 |
}
|
app/code/community/TIG/PostNL/Helper/Cif.php
CHANGED
|
@@ -120,6 +120,8 @@ class TIG_PostNL_Helper_Cif extends TIG_PostNL_Helper_Data
|
|
| 120 |
'GR',
|
| 121 |
'MT',
|
| 122 |
'NL',
|
|
|
|
|
|
|
| 123 |
);
|
| 124 |
|
| 125 |
/**
|
|
@@ -787,6 +789,52 @@ class TIG_PostNL_Helper_Cif extends TIG_PostNL_Helper_Data
|
|
| 787 |
return $tempPostnlShipment->isCod();
|
| 788 |
}
|
| 789 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 790 |
|
| 791 |
/**
|
| 792 |
* Gets the default product option for a shipment
|
|
@@ -818,7 +866,7 @@ class TIG_PostNL_Helper_Cif extends TIG_PostNL_Helper_Data
|
|
| 818 |
*/
|
| 819 |
public function getDefaultProductOptions()
|
| 820 |
{
|
| 821 |
-
trigger_error('This method is deprecated and may be removed in the future.',
|
| 822 |
$storeId = Mage::app()->getStore()->getId();
|
| 823 |
|
| 824 |
$defaultDutchOption = Mage::getStoreConfig(self::XPATH_DEFAULT_STANDARD_PRODUCT_OPTION, $storeId);
|
| 120 |
'GR',
|
| 121 |
'MT',
|
| 122 |
'NL',
|
| 123 |
+
'CY',
|
| 124 |
+
'ML',
|
| 125 |
);
|
| 126 |
|
| 127 |
/**
|
| 789 |
return $tempPostnlShipment->isCod();
|
| 790 |
}
|
| 791 |
|
| 792 |
+
/**
|
| 793 |
+
* Check if a given shipment is a Sunday Delivery
|
| 794 |
+
*
|
| 795 |
+
* @param $shipment
|
| 796 |
+
*
|
| 797 |
+
* @return bool
|
| 798 |
+
*/
|
| 799 |
+
public function isSundayShipment($shipment)
|
| 800 |
+
{
|
| 801 |
+
$postnlShipmentClass = Mage::getConfig()->getModelClassName('postnl_core/shipment');
|
| 802 |
+
if ($shipment instanceof $postnlShipmentClass) {
|
| 803 |
+
/**
|
| 804 |
+
* @var TIG_PostNL_Model_Core_Shipment $shipment
|
| 805 |
+
*/
|
| 806 |
+
return $shipment->isSunday();
|
| 807 |
+
}
|
| 808 |
+
|
| 809 |
+
$tempPostnlShipment = Mage::getModel('postnl_core/shipment');
|
| 810 |
+
$tempPostnlShipment->setShipment($shipment);
|
| 811 |
+
|
| 812 |
+
return $tempPostnlShipment->isSunday();
|
| 813 |
+
}
|
| 814 |
+
|
| 815 |
+
/**
|
| 816 |
+
* Check if a given shipment is a Monday Delivery
|
| 817 |
+
*
|
| 818 |
+
* @param $shipment
|
| 819 |
+
*
|
| 820 |
+
* @return bool
|
| 821 |
+
*/
|
| 822 |
+
public function isMondayShipment($shipment)
|
| 823 |
+
{
|
| 824 |
+
$postnlShipmentClass = Mage::getConfig()->getModelClassName('postnl_core/shipment');
|
| 825 |
+
if ($shipment instanceof $postnlShipmentClass) {
|
| 826 |
+
/**
|
| 827 |
+
* @var TIG_PostNL_Model_Core_Shipment $shipment
|
| 828 |
+
*/
|
| 829 |
+
return $shipment->isMonday();
|
| 830 |
+
}
|
| 831 |
+
|
| 832 |
+
$tempPostnlShipment = Mage::getModel('postnl_core/shipment');
|
| 833 |
+
$tempPostnlShipment->setShipment($shipment);
|
| 834 |
+
|
| 835 |
+
return $tempPostnlShipment->isMonday();
|
| 836 |
+
}
|
| 837 |
+
|
| 838 |
|
| 839 |
/**
|
| 840 |
* Gets the default product option for a shipment
|
| 866 |
*/
|
| 867 |
public function getDefaultProductOptions()
|
| 868 |
{
|
| 869 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_DEPRECATED);
|
| 870 |
$storeId = Mage::app()->getStore()->getId();
|
| 871 |
|
| 872 |
$defaultDutchOption = Mage::getStoreConfig(self::XPATH_DEFAULT_STANDARD_PRODUCT_OPTION, $storeId);
|
app/code/community/TIG/PostNL/Helper/Data.php
CHANGED
|
@@ -271,6 +271,40 @@ class TIG_PostNL_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 271 |
*/
|
| 272 |
protected $_domesticCountry;
|
| 273 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 274 |
/**
|
| 275 |
* Get required fields array.
|
| 276 |
*
|
|
@@ -1349,7 +1383,7 @@ class TIG_PostNL_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 1349 |
*/
|
| 1350 |
public function isTestModeAllowed()
|
| 1351 |
{
|
| 1352 |
-
trigger_error('This method is deprecated and may be removed in the future.',
|
| 1353 |
return true;
|
| 1354 |
}
|
| 1355 |
|
| 271 |
*/
|
| 272 |
protected $_domesticCountry;
|
| 273 |
|
| 274 |
+
/**
|
| 275 |
+
* TIG_PostNL_Helper_Data constructor.
|
| 276 |
+
*/
|
| 277 |
+
public function __construct()
|
| 278 |
+
{
|
| 279 |
+
if (!function_exists('postnlErrorHandler')) {
|
| 280 |
+
/**
|
| 281 |
+
* @param $errno
|
| 282 |
+
* @param $errstr
|
| 283 |
+
* @param $errfile
|
| 284 |
+
* @param $errline
|
| 285 |
+
*
|
| 286 |
+
* @return bool
|
| 287 |
+
* @throws Exception
|
| 288 |
+
*
|
| 289 |
+
* Register E_USER_DEPRECATED errors and pass them on to the Magento core error_handler as regular
|
| 290 |
+
* DEPRECATED errors.
|
| 291 |
+
*
|
| 292 |
+
* Magento's core error handler unfortunately doesn't recognize E_USER_DEPRECATED errors. Most likely
|
| 293 |
+
* because the developers simply forgot.
|
| 294 |
+
*/
|
| 295 |
+
function postnlErrorHandler($errno, $errstr, $errfile, $errline)
|
| 296 |
+
{
|
| 297 |
+
if ($errno == E_USER_DEPRECATED) {
|
| 298 |
+
$errno = E_DEPRECATED;
|
| 299 |
+
}
|
| 300 |
+
|
| 301 |
+
return mageCoreErrorHandler($errno, $errstr, $errfile, $errline);
|
| 302 |
+
}
|
| 303 |
+
|
| 304 |
+
set_error_handler('postnlErrorHandler');
|
| 305 |
+
}
|
| 306 |
+
}
|
| 307 |
+
|
| 308 |
/**
|
| 309 |
* Get required fields array.
|
| 310 |
*
|
| 1383 |
*/
|
| 1384 |
public function isTestModeAllowed()
|
| 1385 |
{
|
| 1386 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_DEPRECATED);
|
| 1387 |
return true;
|
| 1388 |
}
|
| 1389 |
|
app/code/community/TIG/PostNL/Helper/Date.php
CHANGED
|
@@ -39,6 +39,11 @@
|
|
| 39 |
*/
|
| 40 |
class TIG_PostNL_Helper_Date extends TIG_PostNL_Helper_DeliveryOptions
|
| 41 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 42 |
/**
|
| 43 |
* Constants to define the indices for shipping/delivery day arrays.
|
| 44 |
*/
|
|
@@ -140,11 +145,13 @@ class TIG_PostNL_Helper_Date extends TIG_PostNL_Helper_DeliveryOptions
|
|
| 140 |
*/
|
| 141 |
$this->_validDeliveryDays[self::MONDAY] = 0;
|
| 142 |
$this->_validDeliveryDays[self::TUESDAY] = 1;
|
| 143 |
-
} else {
|
| 144 |
-
$this->_validDeliveryDays[self::MONDAY] = 0;
|
| 145 |
}
|
| 146 |
}
|
| 147 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 148 |
/**
|
| 149 |
* If no valid delivery day is found, throw an Exception
|
| 150 |
*/
|
|
@@ -170,7 +177,7 @@ class TIG_PostNL_Helper_Date extends TIG_PostNL_Helper_DeliveryOptions
|
|
| 170 |
* Checks if the current day is a valid day for delivery, using the validDeliveryDay array built beforehand.
|
| 171 |
*
|
| 172 |
* @param int $weekDay
|
| 173 |
-
* @param
|
| 174 |
*
|
| 175 |
* @return bool
|
| 176 |
*/
|
|
@@ -214,7 +221,7 @@ class TIG_PostNL_Helper_Date extends TIG_PostNL_Helper_DeliveryOptions
|
|
| 214 |
/**
|
| 215 |
* Add the calculated total shipping duration to the order date, to get the Delivery Date.
|
| 216 |
*/
|
| 217 |
-
$deliveryDate = $
|
| 218 |
return $deliveryDate;
|
| 219 |
}
|
| 220 |
|
|
@@ -319,13 +326,13 @@ class TIG_PostNL_Helper_Date extends TIG_PostNL_Helper_DeliveryOptions
|
|
| 319 |
*/
|
| 320 |
public function isPastCutOff($orderDateObject, $storeId)
|
| 321 |
{
|
| 322 |
-
$weekDay = $orderDateObject->format('
|
| 323 |
|
| 324 |
/**
|
| 325 |
* If the weekday == 7, we need to check for sunday cutoff time instead.
|
| 326 |
*/
|
| 327 |
$forSunday = false;
|
| 328 |
-
if ($weekDay == self::
|
| 329 |
$forSunday = true;
|
| 330 |
}
|
| 331 |
|
|
@@ -375,14 +382,16 @@ class TIG_PostNL_Helper_Date extends TIG_PostNL_Helper_DeliveryOptions
|
|
| 375 |
/**
|
| 376 |
* If this is not a DateTime object, nor a string, this will get stuck.
|
| 377 |
*/
|
| 378 |
-
if(!is_object($checkValidDay) && !is_string($checkValidDay)) {
|
| 379 |
return 0;
|
| 380 |
}
|
| 381 |
|
| 382 |
if (is_object($checkValidDay)) {
|
|
|
|
| 383 |
$checkValidDay = $checkValidDay->format('N');
|
| 384 |
}
|
| 385 |
|
|
|
|
| 386 |
$checkValidDay = (int) $checkValidDay;
|
| 387 |
|
| 388 |
/**
|
|
@@ -408,4 +417,53 @@ class TIG_PostNL_Helper_Date extends TIG_PostNL_Helper_DeliveryOptions
|
|
| 408 |
|
| 409 |
return $deliveryDurationCorrection;
|
| 410 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 411 |
}
|
| 39 |
*/
|
| 40 |
class TIG_PostNL_Helper_Date extends TIG_PostNL_Helper_DeliveryOptions
|
| 41 |
{
|
| 42 |
+
/**
|
| 43 |
+
* Xpath to the 'valid_shipping_duration_days' setting.
|
| 44 |
+
*/
|
| 45 |
+
const XPATH_VALID_SHIPPING_DURATION_DAYS = 'postnl/grid/valid_shipping_duration_days';
|
| 46 |
+
|
| 47 |
/**
|
| 48 |
* Constants to define the indices for shipping/delivery day arrays.
|
| 49 |
*/
|
| 145 |
*/
|
| 146 |
$this->_validDeliveryDays[self::MONDAY] = 0;
|
| 147 |
$this->_validDeliveryDays[self::TUESDAY] = 1;
|
|
|
|
|
|
|
| 148 |
}
|
| 149 |
}
|
| 150 |
|
| 151 |
+
if (!$sundaySorting) {
|
| 152 |
+
$this->_validDeliveryDays[self::MONDAY] = 0;
|
| 153 |
+
}
|
| 154 |
+
|
| 155 |
/**
|
| 156 |
* If no valid delivery day is found, throw an Exception
|
| 157 |
*/
|
| 177 |
* Checks if the current day is a valid day for delivery, using the validDeliveryDay array built beforehand.
|
| 178 |
*
|
| 179 |
* @param int $weekDay
|
| 180 |
+
* @param array $validDeliveryDays
|
| 181 |
*
|
| 182 |
* @return bool
|
| 183 |
*/
|
| 221 |
/**
|
| 222 |
* Add the calculated total shipping duration to the order date, to get the Delivery Date.
|
| 223 |
*/
|
| 224 |
+
$deliveryDate = $this->getShippingDateCorrection($shippingDuration, $orderDateObject, $storeId);
|
| 225 |
return $deliveryDate;
|
| 226 |
}
|
| 227 |
|
| 326 |
*/
|
| 327 |
public function isPastCutOff($orderDateObject, $storeId)
|
| 328 |
{
|
| 329 |
+
$weekDay = $orderDateObject->format('w');
|
| 330 |
|
| 331 |
/**
|
| 332 |
* If the weekday == 7, we need to check for sunday cutoff time instead.
|
| 333 |
*/
|
| 334 |
$forSunday = false;
|
| 335 |
+
if ($weekDay == self::SUNDAY) {
|
| 336 |
$forSunday = true;
|
| 337 |
}
|
| 338 |
|
| 382 |
/**
|
| 383 |
* If this is not a DateTime object, nor a string, this will get stuck.
|
| 384 |
*/
|
| 385 |
+
if (!is_object($checkValidDay) && !is_string($checkValidDay) && !is_int($checkValidDay)) {
|
| 386 |
return 0;
|
| 387 |
}
|
| 388 |
|
| 389 |
if (is_object($checkValidDay)) {
|
| 390 |
+
/** @var DateTime $checkValidDay */
|
| 391 |
$checkValidDay = $checkValidDay->format('N');
|
| 392 |
}
|
| 393 |
|
| 394 |
+
/** @var int $checkValidDay */
|
| 395 |
$checkValidDay = (int) $checkValidDay;
|
| 396 |
|
| 397 |
/**
|
| 417 |
|
| 418 |
return $deliveryDurationCorrection;
|
| 419 |
}
|
| 420 |
+
|
| 421 |
+
/**
|
| 422 |
+
* Correct the delivery dat with the specified shipping duration, taking into account the configured available
|
| 423 |
+
* shipping duration days.
|
| 424 |
+
*
|
| 425 |
+
* @param int $shippingDuration
|
| 426 |
+
* @param DateTime $deliveryDate
|
| 427 |
+
* @param int $storeId
|
| 428 |
+
*
|
| 429 |
+
* @return DateTime
|
| 430 |
+
*/
|
| 431 |
+
public function getShippingDateCorrection($shippingDuration, DateTime $deliveryDate, $storeId)
|
| 432 |
+
{
|
| 433 |
+
/**
|
| 434 |
+
* Get and array of valid days for the shipping duration calculation.
|
| 435 |
+
*/
|
| 436 |
+
$validDurationDays = explode(
|
| 437 |
+
',',
|
| 438 |
+
Mage::getStoreConfig(self::XPATH_VALID_SHIPPING_DURATION_DAYS, $storeId)
|
| 439 |
+
);
|
| 440 |
+
|
| 441 |
+
/**
|
| 442 |
+
* In case no such array is available, use all days of the week.
|
| 443 |
+
*/
|
| 444 |
+
if (empty($validDurationDays)) {
|
| 445 |
+
$validDurationDays = array(
|
| 446 |
+
self::MONDAY,
|
| 447 |
+
self::TUESDAY,
|
| 448 |
+
self::WEDNESDAY,
|
| 449 |
+
self::THURSDAY,
|
| 450 |
+
self::FRIDAY,
|
| 451 |
+
self::SATURDAY,
|
| 452 |
+
self::ALTERNATIVE_SUNDAY,
|
| 453 |
+
);
|
| 454 |
+
}
|
| 455 |
+
|
| 456 |
+
/**
|
| 457 |
+
* Calculate the delivery date.
|
| 458 |
+
*/
|
| 459 |
+
$i = 0;
|
| 460 |
+
while ($i < $shippingDuration) {
|
| 461 |
+
if (in_array($deliveryDate->format('N'), $validDurationDays)) {
|
| 462 |
+
$i++;
|
| 463 |
+
}
|
| 464 |
+
$deliveryDate->add(new DateInterval('P1D'));
|
| 465 |
+
}
|
| 466 |
+
|
| 467 |
+
return $deliveryDate;
|
| 468 |
+
}
|
| 469 |
}
|
app/code/community/TIG/PostNL/Helper/DeliveryOptions.php
CHANGED
|
@@ -130,7 +130,8 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 130 |
'PG',
|
| 131 |
'PGE',
|
| 132 |
'PA',
|
| 133 |
-
'Sunday'
|
|
|
|
| 134 |
);
|
| 135 |
|
| 136 |
/**
|
|
@@ -209,7 +210,7 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 209 |
*/
|
| 210 |
public function getConfigMinQty()
|
| 211 |
{
|
| 212 |
-
$configMinQty = $this->
|
| 213 |
|
| 214 |
if (is_null($configMinQty)) {
|
| 215 |
$configMinQty = Mage::getStoreConfig(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_MIN_QTY);
|
|
@@ -254,7 +255,7 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 254 |
*/
|
| 255 |
public function getEveningFee($formatted = false, $includingTax = true, $convert = true)
|
| 256 |
{
|
| 257 |
-
trigger_error('This method is deprecated and may be removed in the future.',
|
| 258 |
return Mage::helper('postnl/deliveryOptions_fee')->getEveningFee($formatted, $includingTax, $convert);
|
| 259 |
}
|
| 260 |
|
|
@@ -272,7 +273,7 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 272 |
*/
|
| 273 |
public function getExpressFee($formatted = false, $includingTax = true, $convert = true)
|
| 274 |
{
|
| 275 |
-
trigger_error('This method is deprecated and may be removed in the future.',
|
| 276 |
return Mage::helper('postnl/deliveryOptions_fee')->getExpressFee($formatted, $includingTax, $convert);
|
| 277 |
}
|
| 278 |
|
|
@@ -291,7 +292,7 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 291 |
*/
|
| 292 |
public function getPakjeGemakFee($currentRate, $formatted = false, $includingTax = true, $convert = true)
|
| 293 |
{
|
| 294 |
-
trigger_error('This method is deprecated and may be removed in the future.',
|
| 295 |
return Mage::helper('postnl/deliveryOptions_fee')->getPakjeGemakFee($currentRate, $formatted, $includingTax, $convert);
|
| 296 |
}
|
| 297 |
|
|
@@ -310,7 +311,7 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 310 |
*/
|
| 311 |
public function getOptionsFee(TIG_PostNL_Model_Core_Order $postnlOrder, $formatted = false, $includingTax = true, $convert = true)
|
| 312 |
{
|
| 313 |
-
trigger_error('This method is deprecated and may be removed in the future.',
|
| 314 |
return Mage::helper('postnl/deliveryOptions_fee')->getOptionsFee($postnlOrder, $formatted, $includingTax, $convert);
|
| 315 |
}
|
| 316 |
|
|
@@ -329,7 +330,7 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 329 |
*/
|
| 330 |
public function getOptionFee($option, $formatted = false, $includingTax = true, $convert = true)
|
| 331 |
{
|
| 332 |
-
trigger_error('This method is deprecated and may be removed in the future.',
|
| 333 |
return Mage::helper('postnl/deliveryOptions_fee')->getOptionFee($option, $formatted, $includingTax, $convert);
|
| 334 |
}
|
| 335 |
|
|
@@ -509,10 +510,22 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 509 |
$productCode = $postnlOrder->getProductCode();
|
| 510 |
}
|
| 511 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 512 |
/**
|
| 513 |
* Add the delivery date.
|
| 514 |
*/
|
| 515 |
-
if ($deliveryDate
|
|
|
|
|
|
|
|
|
|
| 516 |
$deliveryDate = new DateTime($deliveryDate, $utcTimeZone);
|
| 517 |
|
| 518 |
$deliveryOptionsInfo['delivery_date'] = $deliveryDate->format('Y-m-d H:i:s');
|
|
@@ -623,8 +636,18 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 623 |
$timeFrameDate = new DateTime($timeFrame->Date, new DateTimeZone('UTC'));
|
| 624 |
$timeFrameDay = $timeFrameDate->format('N');
|
| 625 |
$correctedTimeFrameDay = $timeFrameDay % 7;
|
|
|
|
| 626 |
if ($deliveryDateArray[$correctedTimeFrameDay] == 0) {
|
| 627 |
unset($timeframes[$key]);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 628 |
}
|
| 629 |
}
|
| 630 |
|
|
@@ -716,7 +739,7 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 716 |
*/
|
| 717 |
public function getShippingDuration(Mage_Sales_Model_Quote $quote = null)
|
| 718 |
{
|
| 719 |
-
trigger_error('This method is deprecated and may be removed in the future.',
|
| 720 |
return $this->getQuoteShippingDuration($quote);
|
| 721 |
}
|
| 722 |
|
|
@@ -758,7 +781,7 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 758 |
*/
|
| 759 |
$items = $quote->getItemsCollection();
|
| 760 |
foreach ($items as $key => $item) {
|
| 761 |
-
if ($item->isDeleted()
|
| 762 |
$items->removeItemByKey($key);
|
| 763 |
}
|
| 764 |
}
|
|
@@ -932,7 +955,7 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 932 |
*/
|
| 933 |
public function getPriceWithTax($price, $includingTax, $formatted = false, $convert = true)
|
| 934 |
{
|
| 935 |
-
trigger_error('This method is deprecated and may be removed in the future.',
|
| 936 |
return Mage::helper('postnl/deliveryOptions_fee')->getPriceWithTax($price, $includingTax, $formatted, $convert);
|
| 937 |
}
|
| 938 |
|
|
@@ -1159,6 +1182,11 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 1159 |
foreach ($quoteItems as $item) {
|
| 1160 |
if ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_BUNDLE) {
|
| 1161 |
$poLocationsAllowed = $this->bundleCheckAllowedForSimpleProducts($item, 'postnl_allow_pakje_gemak');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1162 |
} else {
|
| 1163 |
$poLocationsAllowed = Mage::getResourceSingleton('postnl/catalog_product')->getAttributeRawValue(
|
| 1164 |
$item->getProductId(),
|
|
@@ -1406,7 +1434,15 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 1406 |
$quoteItems = $quote->getAllItems();
|
| 1407 |
foreach ($quoteItems as $item) {
|
| 1408 |
if ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_BUNDLE) {
|
| 1409 |
-
$pakketautomaatAllowed = $this->bundleCheckAllowedForSimpleProducts(
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1410 |
} else {
|
| 1411 |
$pakketautomaatAllowed = Mage::getResourceSingleton('postnl/catalog_product')->getAttributeRawValue(
|
| 1412 |
$item->getProductId(),
|
|
@@ -1579,6 +1615,11 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 1579 |
*/
|
| 1580 |
if ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_BUNDLE) {
|
| 1581 |
$deliveryDaysAllowed = $this->bundleCheckAllowedForSimpleProducts($item, 'postnl_allow_delivery_days');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1582 |
} else {
|
| 1583 |
$deliveryDaysAllowed = Mage::getResourceSingleton('postnl/catalog_product')->getAttributeRawValue(
|
| 1584 |
$item->getProductId(),
|
|
@@ -1719,6 +1760,11 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 1719 |
*/
|
| 1720 |
if ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_BUNDLE) {
|
| 1721 |
$timeframesAllowed = $this->bundleCheckAllowedForSimpleProducts($item, 'postnl_allow_timeframes');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1722 |
} else {
|
| 1723 |
$timeframesAllowed = Mage::getResourceSingleton('postnl/catalog_product')->getAttributeRawValue(
|
| 1724 |
$item->getProductId(),
|
|
@@ -2010,7 +2056,15 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 2010 |
* simple products. Else just check the given product, since this will point correctly to the simple product.
|
| 2011 |
*/
|
| 2012 |
if ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_BUNDLE) {
|
| 2013 |
-
$allowDeliveryOptions = $this->bundleCheckAllowedForSimpleProducts(
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2014 |
} else {
|
| 2015 |
$allowDeliveryOptions = Mage::getResourceSingleton('postnl/catalog_product')->getAttributeRawValue(
|
| 2016 |
$productId,
|
|
@@ -2019,7 +2073,9 @@ class TIG_PostNL_Helper_DeliveryOptions extends TIG_PostNL_Helper_Checkout
|
|
| 2019 |
);
|
| 2020 |
|
| 2021 |
if ($option) {
|
| 2022 |
-
|
|
|
|
|
|
|
| 2023 |
$parentProductId,
|
| 2024 |
'postnl_allow_delivery_options',
|
| 2025 |
$item->getStoreId()
|
| 130 |
'PG',
|
| 131 |
'PGE',
|
| 132 |
'PA',
|
| 133 |
+
'Sunday',
|
| 134 |
+
'Monday',
|
| 135 |
);
|
| 136 |
|
| 137 |
/**
|
| 210 |
*/
|
| 211 |
public function getConfigMinQty()
|
| 212 |
{
|
| 213 |
+
$configMinQty = $this->_configMinQty;
|
| 214 |
|
| 215 |
if (is_null($configMinQty)) {
|
| 216 |
$configMinQty = Mage::getStoreConfig(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_MIN_QTY);
|
| 255 |
*/
|
| 256 |
public function getEveningFee($formatted = false, $includingTax = true, $convert = true)
|
| 257 |
{
|
| 258 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_DEPRECATED);
|
| 259 |
return Mage::helper('postnl/deliveryOptions_fee')->getEveningFee($formatted, $includingTax, $convert);
|
| 260 |
}
|
| 261 |
|
| 273 |
*/
|
| 274 |
public function getExpressFee($formatted = false, $includingTax = true, $convert = true)
|
| 275 |
{
|
| 276 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_DEPRECATED);
|
| 277 |
return Mage::helper('postnl/deliveryOptions_fee')->getExpressFee($formatted, $includingTax, $convert);
|
| 278 |
}
|
| 279 |
|
| 292 |
*/
|
| 293 |
public function getPakjeGemakFee($currentRate, $formatted = false, $includingTax = true, $convert = true)
|
| 294 |
{
|
| 295 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_DEPRECATED);
|
| 296 |
return Mage::helper('postnl/deliveryOptions_fee')->getPakjeGemakFee($currentRate, $formatted, $includingTax, $convert);
|
| 297 |
}
|
| 298 |
|
| 311 |
*/
|
| 312 |
public function getOptionsFee(TIG_PostNL_Model_Core_Order $postnlOrder, $formatted = false, $includingTax = true, $convert = true)
|
| 313 |
{
|
| 314 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_DEPRECATED);
|
| 315 |
return Mage::helper('postnl/deliveryOptions_fee')->getOptionsFee($postnlOrder, $formatted, $includingTax, $convert);
|
| 316 |
}
|
| 317 |
|
| 330 |
*/
|
| 331 |
public function getOptionFee($option, $formatted = false, $includingTax = true, $convert = true)
|
| 332 |
{
|
| 333 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_DEPRECATED);
|
| 334 |
return Mage::helper('postnl/deliveryOptions_fee')->getOptionFee($option, $formatted, $includingTax, $convert);
|
| 335 |
}
|
| 336 |
|
| 510 |
$productCode = $postnlOrder->getProductCode();
|
| 511 |
}
|
| 512 |
|
| 513 |
+
$shippingAddress = null;
|
| 514 |
+
if ($postnlOrder->getOrder()) {
|
| 515 |
+
$shippingAddress = $postnlOrder->getOrder()->getShippingAddress();
|
| 516 |
+
} elseif ($postnlOrder->getQuote()) {
|
| 517 |
+
$shippingAddress = $postnlOrder->getQuote()->getShippingAddress();
|
| 518 |
+
} elseif (Mage::getSingleton('checkout/session')->getQuote()) {
|
| 519 |
+
$shippingAddress = Mage::getSingleton('checkout/session')->getQuote()->getShippingAddress();
|
| 520 |
+
}
|
| 521 |
+
|
| 522 |
/**
|
| 523 |
* Add the delivery date.
|
| 524 |
*/
|
| 525 |
+
if ($deliveryDate
|
| 526 |
+
&& $shippingAddress
|
| 527 |
+
&& $shippingAddress->getCountryId() == $this->getDomesticCountry()
|
| 528 |
+
) {
|
| 529 |
$deliveryDate = new DateTime($deliveryDate, $utcTimeZone);
|
| 530 |
|
| 531 |
$deliveryOptionsInfo['delivery_date'] = $deliveryDate->format('Y-m-d H:i:s');
|
| 636 |
$timeFrameDate = new DateTime($timeFrame->Date, new DateTimeZone('UTC'));
|
| 637 |
$timeFrameDay = $timeFrameDate->format('N');
|
| 638 |
$correctedTimeFrameDay = $timeFrameDay % 7;
|
| 639 |
+
|
| 640 |
if ($deliveryDateArray[$correctedTimeFrameDay] == 0) {
|
| 641 |
unset($timeframes[$key]);
|
| 642 |
+
} elseif ($timeFrameDay == TIG_PostNL_Helper_Date::MONDAY) {
|
| 643 |
+
foreach ($timeFrame->Timeframes->TimeframeTimeFrame as $timeframeTimeframeKey => $timeframeTimeframe) {
|
| 644 |
+
if ($timeframeTimeframe->Options->string[0] == 'Daytime') {
|
| 645 |
+
$timeframes[$key]->Timeframes
|
| 646 |
+
->TimeframeTimeFrame[$timeframeTimeframeKey]
|
| 647 |
+
->Options
|
| 648 |
+
->string[0] = 'Monday';
|
| 649 |
+
}
|
| 650 |
+
}
|
| 651 |
}
|
| 652 |
}
|
| 653 |
|
| 739 |
*/
|
| 740 |
public function getShippingDuration(Mage_Sales_Model_Quote $quote = null)
|
| 741 |
{
|
| 742 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_DEPRECATED);
|
| 743 |
return $this->getQuoteShippingDuration($quote);
|
| 744 |
}
|
| 745 |
|
| 781 |
*/
|
| 782 |
$items = $quote->getItemsCollection();
|
| 783 |
foreach ($items as $key => $item) {
|
| 784 |
+
if ($item->isDeleted()) {
|
| 785 |
$items->removeItemByKey($key);
|
| 786 |
}
|
| 787 |
}
|
| 955 |
*/
|
| 956 |
public function getPriceWithTax($price, $includingTax, $formatted = false, $convert = true)
|
| 957 |
{
|
| 958 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_DEPRECATED);
|
| 959 |
return Mage::helper('postnl/deliveryOptions_fee')->getPriceWithTax($price, $includingTax, $formatted, $convert);
|
| 960 |
}
|
| 961 |
|
| 1182 |
foreach ($quoteItems as $item) {
|
| 1183 |
if ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_BUNDLE) {
|
| 1184 |
$poLocationsAllowed = $this->bundleCheckAllowedForSimpleProducts($item, 'postnl_allow_pakje_gemak');
|
| 1185 |
+
} elseif ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_VIRTUAL) {
|
| 1186 |
+
/**
|
| 1187 |
+
* Virtual products have no PostNL settings.
|
| 1188 |
+
*/
|
| 1189 |
+
continue;
|
| 1190 |
} else {
|
| 1191 |
$poLocationsAllowed = Mage::getResourceSingleton('postnl/catalog_product')->getAttributeRawValue(
|
| 1192 |
$item->getProductId(),
|
| 1434 |
$quoteItems = $quote->getAllItems();
|
| 1435 |
foreach ($quoteItems as $item) {
|
| 1436 |
if ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_BUNDLE) {
|
| 1437 |
+
$pakketautomaatAllowed = $this->bundleCheckAllowedForSimpleProducts(
|
| 1438 |
+
$item,
|
| 1439 |
+
'postnl_allow_pakketautomaat'
|
| 1440 |
+
);
|
| 1441 |
+
} elseif ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_VIRTUAL) {
|
| 1442 |
+
/**
|
| 1443 |
+
* Virtual products have no PostNL settings.
|
| 1444 |
+
*/
|
| 1445 |
+
continue;
|
| 1446 |
} else {
|
| 1447 |
$pakketautomaatAllowed = Mage::getResourceSingleton('postnl/catalog_product')->getAttributeRawValue(
|
| 1448 |
$item->getProductId(),
|
| 1615 |
*/
|
| 1616 |
if ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_BUNDLE) {
|
| 1617 |
$deliveryDaysAllowed = $this->bundleCheckAllowedForSimpleProducts($item, 'postnl_allow_delivery_days');
|
| 1618 |
+
} elseif ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_VIRTUAL) {
|
| 1619 |
+
/**
|
| 1620 |
+
* Virtual products have no PostNL settings.
|
| 1621 |
+
*/
|
| 1622 |
+
continue;
|
| 1623 |
} else {
|
| 1624 |
$deliveryDaysAllowed = Mage::getResourceSingleton('postnl/catalog_product')->getAttributeRawValue(
|
| 1625 |
$item->getProductId(),
|
| 1760 |
*/
|
| 1761 |
if ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_BUNDLE) {
|
| 1762 |
$timeframesAllowed = $this->bundleCheckAllowedForSimpleProducts($item, 'postnl_allow_timeframes');
|
| 1763 |
+
} elseif ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_VIRTUAL) {
|
| 1764 |
+
/**
|
| 1765 |
+
* Virtual products have no PostNL settings.
|
| 1766 |
+
*/
|
| 1767 |
+
continue;
|
| 1768 |
} else {
|
| 1769 |
$timeframesAllowed = Mage::getResourceSingleton('postnl/catalog_product')->getAttributeRawValue(
|
| 1770 |
$item->getProductId(),
|
| 2056 |
* simple products. Else just check the given product, since this will point correctly to the simple product.
|
| 2057 |
*/
|
| 2058 |
if ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_BUNDLE) {
|
| 2059 |
+
$allowDeliveryOptions = $this->bundleCheckAllowedForSimpleProducts(
|
| 2060 |
+
$item,
|
| 2061 |
+
'postnl_allow_delivery_options'
|
| 2062 |
+
);
|
| 2063 |
+
} elseif ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_VIRTUAL) {
|
| 2064 |
+
/**
|
| 2065 |
+
* Virtual products have no PostNL settings.
|
| 2066 |
+
*/
|
| 2067 |
+
continue;
|
| 2068 |
} else {
|
| 2069 |
$allowDeliveryOptions = Mage::getResourceSingleton('postnl/catalog_product')->getAttributeRawValue(
|
| 2070 |
$productId,
|
| 2073 |
);
|
| 2074 |
|
| 2075 |
if ($option) {
|
| 2076 |
+
/** @noinspection PhpUndefinedVariableInspection */
|
| 2077 |
+
$allowParentDeliveryOptions = Mage::getResourceSingleton('postnl/catalog_product')
|
| 2078 |
+
->getAttributeRawValue(
|
| 2079 |
$parentProductId,
|
| 2080 |
'postnl_allow_delivery_options',
|
| 2081 |
$item->getStoreId()
|
app/code/community/TIG/PostNL/Model/Admin/Logging/Handler/Postnl.php
CHANGED
|
@@ -35,6 +35,8 @@
|
|
| 35 |
*
|
| 36 |
* @copyright Copyright (c) 2015 Total Internet Group B.V. (http://www.tig.nl)
|
| 37 |
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
|
|
|
|
|
|
|
| 38 |
*/
|
| 39 |
class TIG_PostNL_Model_Admin_Logging_Handler_Postnl extends Enterprise_Logging_Model_Handler_Controllers
|
| 40 |
{
|
|
@@ -45,9 +47,13 @@ class TIG_PostNL_Model_Admin_Logging_Handler_Postnl extends Enterprise_Logging_M
|
|
| 45 |
* @param Enterprise_Logging_Model_Event $eventModel
|
| 46 |
*
|
| 47 |
* @return boolean
|
|
|
|
|
|
|
| 48 |
*/
|
| 49 |
public function postDispatchSaveMassAction($config, $eventModel)
|
| 50 |
{
|
|
|
|
|
|
|
| 51 |
$request = Mage::app()->getRequest();
|
| 52 |
if ($request->getParam('shipment_ids')) {
|
| 53 |
$eventModel->setInfo(
|
|
@@ -75,9 +81,13 @@ class TIG_PostNL_Model_Admin_Logging_Handler_Postnl extends Enterprise_Logging_M
|
|
| 75 |
* @param Enterprise_Logging_Model_Event $eventModel
|
| 76 |
*
|
| 77 |
* @return boolean
|
|
|
|
|
|
|
| 78 |
*/
|
| 79 |
public function postDispatchAction($config, $eventModel)
|
| 80 |
{
|
|
|
|
|
|
|
| 81 |
return true;
|
| 82 |
}
|
| 83 |
}
|
| 35 |
*
|
| 36 |
* @copyright Copyright (c) 2015 Total Internet Group B.V. (http://www.tig.nl)
|
| 37 |
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
|
| 38 |
+
*
|
| 39 |
+
* @deprecated this class is no longer used as of v1.7.0.
|
| 40 |
*/
|
| 41 |
class TIG_PostNL_Model_Admin_Logging_Handler_Postnl extends Enterprise_Logging_Model_Handler_Controllers
|
| 42 |
{
|
| 47 |
* @param Enterprise_Logging_Model_Event $eventModel
|
| 48 |
*
|
| 49 |
* @return boolean
|
| 50 |
+
*
|
| 51 |
+
* @deprecated v1.7.0
|
| 52 |
*/
|
| 53 |
public function postDispatchSaveMassAction($config, $eventModel)
|
| 54 |
{
|
| 55 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_DEPRECATED);
|
| 56 |
+
|
| 57 |
$request = Mage::app()->getRequest();
|
| 58 |
if ($request->getParam('shipment_ids')) {
|
| 59 |
$eventModel->setInfo(
|
| 81 |
* @param Enterprise_Logging_Model_Event $eventModel
|
| 82 |
*
|
| 83 |
* @return boolean
|
| 84 |
+
*
|
| 85 |
+
* @deprecated v1.7.0
|
| 86 |
*/
|
| 87 |
public function postDispatchAction($config, $eventModel)
|
| 88 |
{
|
| 89 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_DEPRECATED);
|
| 90 |
+
|
| 91 |
return true;
|
| 92 |
}
|
| 93 |
}
|
app/code/community/TIG/PostNL/Model/Admin/Logging/Observer.php
CHANGED
|
@@ -35,6 +35,8 @@
|
|
| 35 |
*
|
| 36 |
* @copyright Copyright (c) 2015 Total Internet Group B.V. (http://www.tig.nl)
|
| 37 |
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
|
|
|
|
|
|
|
| 38 |
*/
|
| 39 |
class TIG_PostNL_Model_Admin_Logging_Observer
|
| 40 |
{
|
|
@@ -47,9 +49,13 @@ class TIG_PostNL_Model_Admin_Logging_Observer
|
|
| 47 |
* @return $this
|
| 48 |
*
|
| 49 |
* @see Enterprise_Logging_Model_Observer::controllerPostdispatch()
|
|
|
|
|
|
|
| 50 |
*/
|
| 51 |
public function controllerPostdispatch(Varien_Event_Observer $observer)
|
| 52 |
{
|
|
|
|
|
|
|
| 53 |
$loggingObserverClassName = Mage::getConfig()->getModelClassName('enterprise_logging/observer');
|
| 54 |
$found = mageFindClassFile($loggingObserverClassName);
|
| 55 |
|
| 35 |
*
|
| 36 |
* @copyright Copyright (c) 2015 Total Internet Group B.V. (http://www.tig.nl)
|
| 37 |
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
|
| 38 |
+
*
|
| 39 |
+
* @deprecated this class is no longer used as of v1.7.0.
|
| 40 |
*/
|
| 41 |
class TIG_PostNL_Model_Admin_Logging_Observer
|
| 42 |
{
|
| 49 |
* @return $this
|
| 50 |
*
|
| 51 |
* @see Enterprise_Logging_Model_Observer::controllerPostdispatch()
|
| 52 |
+
*
|
| 53 |
+
* @deprecated v1.7.0
|
| 54 |
*/
|
| 55 |
public function controllerPostdispatch(Varien_Event_Observer $observer)
|
| 56 |
{
|
| 57 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_DEPRECATED);
|
| 58 |
+
|
| 59 |
$loggingObserverClassName = Mage::getConfig()->getModelClassName('enterprise_logging/observer');
|
| 60 |
$found = mageFindClassFile($loggingObserverClassName);
|
| 61 |
|
app/code/community/TIG/PostNL/Model/Adminhtml/Observer/OrderGrid.php
CHANGED
|
@@ -389,6 +389,30 @@ class TIG_PostNL_Model_Adminhtml_Observer_OrderGrid extends Varien_Object
|
|
| 389 |
$storeIdColumn->setFilterIndex('main_table.store_id');
|
| 390 |
}
|
| 391 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 392 |
return $this;
|
| 393 |
}
|
| 394 |
|
|
@@ -420,6 +444,7 @@ class TIG_PostNL_Model_Adminhtml_Observer_OrderGrid extends Varien_Object
|
|
| 420 |
'pakketautomaat' => $helper->__('Parcel Dispenser'),
|
| 421 |
'avond' => $helper->__('Evening Delivery'),
|
| 422 |
'sunday' => $helper->__('Sunday Delivery'),
|
|
|
|
| 423 |
'pakje_gemak_express' => $helper->__('Early Pickup'),
|
| 424 |
),
|
| 425 |
);
|
|
@@ -1066,9 +1091,8 @@ class TIG_PostNL_Model_Adminhtml_Observer_OrderGrid extends Varien_Object
|
|
| 1066 |
),
|
| 1067 |
'postnl_pg_options' => $optionsModel->getOptions(
|
| 1068 |
array(
|
| 1069 |
-
'group' => '
|
| 1070 |
'isCod' => false,
|
| 1071 |
-
'isAvond' => true,
|
| 1072 |
),
|
| 1073 |
false,
|
| 1074 |
true
|
|
@@ -1100,7 +1124,6 @@ class TIG_PostNL_Model_Adminhtml_Observer_OrderGrid extends Varien_Object
|
|
| 1100 |
array(
|
| 1101 |
'group' => 'standard_options',
|
| 1102 |
'isCod' => true,
|
| 1103 |
-
'isBelgiumOnly' => false,
|
| 1104 |
),
|
| 1105 |
false,
|
| 1106 |
true
|
|
@@ -1362,6 +1385,15 @@ class TIG_PostNL_Model_Adminhtml_Observer_OrderGrid extends Varien_Object
|
|
| 1362 |
return $this;
|
| 1363 |
}
|
| 1364 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1365 |
/**
|
| 1366 |
* If the filter condition is PakjeGemak, filter out all non-PakjeGemak orders
|
| 1367 |
*/
|
|
@@ -1388,13 +1420,27 @@ class TIG_PostNL_Model_Adminhtml_Observer_OrderGrid extends Varien_Object
|
|
| 1388 |
return $this;
|
| 1389 |
}
|
| 1390 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1391 |
/**
|
| 1392 |
* If the filter condition is NL, filter out all orders not being shipped to the Netherlands. PakjeGemak,
|
| 1393 |
* PakjeGemak Express, evening delivery and pakketautomaat shipments are also shipped to the Netherlands so we
|
| 1394 |
* need to explicitly filter those as well.
|
| 1395 |
*/
|
| 1396 |
$domesticCountry = Mage::helper('postnl')->getDomesticCountry();
|
| 1397 |
-
if ($filterCond == $domesticCountry) {
|
| 1398 |
$collection->addFieldToFilter('country_id', $cond);
|
| 1399 |
$collection->addFieldToFilter(
|
| 1400 |
'postnl_order.type',
|
| 389 |
$storeIdColumn->setFilterIndex('main_table.store_id');
|
| 390 |
}
|
| 391 |
|
| 392 |
+
$this->_modifyExtensionColumns($block);
|
| 393 |
+
|
| 394 |
+
return $this;
|
| 395 |
+
}
|
| 396 |
+
|
| 397 |
+
/**
|
| 398 |
+
* Modify columns added by other extensions for compatibility reasons.
|
| 399 |
+
*
|
| 400 |
+
* @param Mage_Adminhtml_Block_Sales_Order_Grid $block
|
| 401 |
+
*
|
| 402 |
+
* @return $this
|
| 403 |
+
*/
|
| 404 |
+
protected function _modifyExtensionColumns($block)
|
| 405 |
+
{
|
| 406 |
+
/**
|
| 407 |
+
* Fix for conflict with Adyen_Payment extension.
|
| 408 |
+
*
|
| 409 |
+
* @var Mage_Adminhtml_Block_Widget_Grid_Column $adyenEventCodeColumn
|
| 410 |
+
*/
|
| 411 |
+
$adyenEventCodeColumn = $block->getColumn('adyen_event_code');
|
| 412 |
+
if ($adyenEventCodeColumn) {
|
| 413 |
+
$adyenEventCodeColumn->setFilterIndex('main_table.adyen_event_code');
|
| 414 |
+
}
|
| 415 |
+
|
| 416 |
return $this;
|
| 417 |
}
|
| 418 |
|
| 444 |
'pakketautomaat' => $helper->__('Parcel Dispenser'),
|
| 445 |
'avond' => $helper->__('Evening Delivery'),
|
| 446 |
'sunday' => $helper->__('Sunday Delivery'),
|
| 447 |
+
'monday' => $helper->__('Monday Delivery'),
|
| 448 |
'pakje_gemak_express' => $helper->__('Early Pickup'),
|
| 449 |
),
|
| 450 |
);
|
| 1091 |
),
|
| 1092 |
'postnl_pg_options' => $optionsModel->getOptions(
|
| 1093 |
array(
|
| 1094 |
+
'group' => 'pakjegemak_options',
|
| 1095 |
'isCod' => false,
|
|
|
|
| 1096 |
),
|
| 1097 |
false,
|
| 1098 |
true
|
| 1124 |
array(
|
| 1125 |
'group' => 'standard_options',
|
| 1126 |
'isCod' => true,
|
|
|
|
| 1127 |
),
|
| 1128 |
false,
|
| 1129 |
true
|
| 1385 |
return $this;
|
| 1386 |
}
|
| 1387 |
|
| 1388 |
+
/**
|
| 1389 |
+
* If the filter condition is monday delivery, filter out all other orders
|
| 1390 |
+
*/
|
| 1391 |
+
if ($filterCond == 'monday') {
|
| 1392 |
+
$collection->addFieldToFilter('postnl_order.type', array('eq' => 'Monday'));
|
| 1393 |
+
|
| 1394 |
+
return $this;
|
| 1395 |
+
}
|
| 1396 |
+
|
| 1397 |
/**
|
| 1398 |
* If the filter condition is PakjeGemak, filter out all non-PakjeGemak orders
|
| 1399 |
*/
|
| 1420 |
return $this;
|
| 1421 |
}
|
| 1422 |
|
| 1423 |
+
/**
|
| 1424 |
+
* If the filter condition is Domestic, filter out all non-Overdag orders.
|
| 1425 |
+
*/
|
| 1426 |
+
if ($filterCond == 'nl') {
|
| 1427 |
+
$collection->addFieldToFilter(
|
| 1428 |
+
'postnl_order.type',
|
| 1429 |
+
array(
|
| 1430 |
+
array('eq' => 'overdag'),
|
| 1431 |
+
array('null' => true)
|
| 1432 |
+
)
|
| 1433 |
+
);
|
| 1434 |
+
return $this;
|
| 1435 |
+
}
|
| 1436 |
+
|
| 1437 |
/**
|
| 1438 |
* If the filter condition is NL, filter out all orders not being shipped to the Netherlands. PakjeGemak,
|
| 1439 |
* PakjeGemak Express, evening delivery and pakketautomaat shipments are also shipped to the Netherlands so we
|
| 1440 |
* need to explicitly filter those as well.
|
| 1441 |
*/
|
| 1442 |
$domesticCountry = Mage::helper('postnl')->getDomesticCountry();
|
| 1443 |
+
if ($filterCond == strtolower($domesticCountry)) {
|
| 1444 |
$collection->addFieldToFilter('country_id', $cond);
|
| 1445 |
$collection->addFieldToFilter(
|
| 1446 |
'postnl_order.type',
|
app/code/community/TIG/PostNL/Model/Adminhtml/Observer/ShipmentGrid.php
CHANGED
|
@@ -397,15 +397,22 @@ class TIG_PostNL_Model_Adminhtml_Observer_ShipmentGrid extends Varien_Object
|
|
| 397 |
'width' => '75px',
|
| 398 |
'sortable' => false,
|
| 399 |
'options' => array(
|
| 400 |
-
|
| 401 |
-
|
| 402 |
-
|
| 403 |
-
|
| 404 |
-
|
| 405 |
-
|
| 406 |
-
|
| 407 |
-
|
| 408 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 409 |
),
|
| 410 |
),
|
| 411 |
$after
|
| 397 |
'width' => '75px',
|
| 398 |
'sortable' => false,
|
| 399 |
'options' => array(
|
| 400 |
+
TIG_PostNL_Model_Core_Shipment::SHIPMENT_TYPE_DOMESTIC => $helper->__('Domestic'),
|
| 401 |
+
TIG_PostNL_Model_Core_Shipment::SHIPMENT_TYPE_DOMESTIC_COD => $helper->__('Domestic (COD)'),
|
| 402 |
+
TIG_PostNL_Model_Core_Shipment::SHIPMENT_TYPE_PG => $helper->__('PakjeGemak'),
|
| 403 |
+
TIG_PostNL_Model_Core_Shipment::SHIPMENT_TYPE_PG_COD => $helper->__('PakjeGemak (COD)'),
|
| 404 |
+
TIG_PostNL_Model_Core_Shipment::SHIPMENT_TYPE_EPS => $helper->__('EPS'),
|
| 405 |
+
TIG_PostNL_Model_Core_Shipment::SHIPMENT_TYPE_GLOBALPACK => $helper->__('GlobalPack'),
|
| 406 |
+
TIG_PostNL_Model_Core_Shipment::SHIPMENT_TYPE_PA => $helper->__('Parcel Dispenser'),
|
| 407 |
+
TIG_PostNL_Model_Core_Shipment::SHIPMENT_TYPE_AVOND => $helper->__('Evening Delivery'),
|
| 408 |
+
TIG_PostNL_Model_Core_Shipment::SHIPMENT_TYPE_AVOND_COD => $helper->__(
|
| 409 |
+
'Evening Delivery (COD)'
|
| 410 |
+
),
|
| 411 |
+
TIG_PostNL_Model_Core_Shipment::SHIPMENT_TYPE_SUNDAY => $helper->__('Sunday Delivery'),
|
| 412 |
+
TIG_PostNL_Model_Core_Shipment::SHIPMENT_TYPE_MONDAY => $helper->__('Monday Delivery'),
|
| 413 |
+
TIG_PostNL_Model_Core_Shipment::SHIPMENT_TYPE_PGE => $helper->__('Early Pickup'),
|
| 414 |
+
TIG_PostNL_Model_Core_Shipment::SHIPMENT_TYPE_PGE_COD => $helper->__('Early Pickup (COD)'),
|
| 415 |
+
TIG_PostNL_Model_Core_Shipment::SHIPMENT_TYPE_BUSPAKJE => $helper->__('Letter Box Parcel'),
|
| 416 |
),
|
| 417 |
),
|
| 418 |
$after
|
app/code/community/TIG/PostNL/Model/Carrier/Postnl.php
CHANGED
|
@@ -141,21 +141,21 @@ class TIG_PostNL_Model_Carrier_Postnl extends Mage_Shipping_Model_Carrier_Abstra
|
|
| 141 |
$countryId = $request->getDestCountryId();
|
| 142 |
$helper = $this->getHelper();
|
| 143 |
if ($countryId) {
|
|
|
|
| 144 |
$euCountries = Mage::helper('postnl/cif')->getEuCountries();
|
| 145 |
|
| 146 |
-
if ($countryId ==
|
| 147 |
&& !$helper->canUseStandard()
|
| 148 |
) {
|
| 149 |
return false;
|
| 150 |
-
}
|
| 151 |
-
|
| 152 |
-
|
| 153 |
&& !$helper->canUseEps()
|
| 154 |
) {
|
| 155 |
return false;
|
| 156 |
-
}
|
| 157 |
-
|
| 158 |
-
if ($countryId != 'NL'
|
| 159 |
&& !in_array($countryId, $euCountries)
|
| 160 |
&& !$helper->canUseGlobalPack()
|
| 161 |
) {
|
| 141 |
$countryId = $request->getDestCountryId();
|
| 142 |
$helper = $this->getHelper();
|
| 143 |
if ($countryId) {
|
| 144 |
+
$domesticCountry = $helper->getDomesticCountry();
|
| 145 |
$euCountries = Mage::helper('postnl/cif')->getEuCountries();
|
| 146 |
|
| 147 |
+
if ($countryId == $domesticCountry
|
| 148 |
&& !$helper->canUseStandard()
|
| 149 |
) {
|
| 150 |
return false;
|
| 151 |
+
} elseif (
|
| 152 |
+
$countryId != $domesticCountry
|
| 153 |
+
&& in_array($countryId, $euCountries)
|
| 154 |
&& !$helper->canUseEps()
|
| 155 |
) {
|
| 156 |
return false;
|
| 157 |
+
} elseif (
|
| 158 |
+
$countryId != $domesticCountry
|
|
|
|
| 159 |
&& !in_array($countryId, $euCountries)
|
| 160 |
&& !$helper->canUseGlobalPack()
|
| 161 |
) {
|
app/code/community/TIG/PostNL/Model/Core/Cif.php
CHANGED
|
@@ -2131,4 +2131,4 @@ class TIG_PostNL_Model_Core_Cif extends TIG_PostNL_Model_Core_Cif_Abstract
|
|
| 2131 |
|
| 2132 |
return $customerNumber;
|
| 2133 |
}
|
| 2134 |
-
}
|
| 2131 |
|
| 2132 |
return $customerNumber;
|
| 2133 |
}
|
| 2134 |
+
}
|
app/code/community/TIG/PostNL/Model/Core/Label.php
CHANGED
|
@@ -62,7 +62,7 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 62 |
/**
|
| 63 |
* Regex to determine whether a label is actually a combi-label.
|
| 64 |
*/
|
| 65 |
-
const COMBI_LABEL_REGEX =
|
| 66 |
|
| 67 |
/**
|
| 68 |
* An array of temporary files that have been created. these files will be destroyed at the end of the script.
|
|
@@ -107,7 +107,7 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 107 |
* @var array
|
| 108 |
*/
|
| 109 |
protected $_labelPositions = array(
|
| 110 |
-
|
| 111 |
1 => array(
|
| 112 |
'x' => 152.4,
|
| 113 |
'y' => 3.9,
|
|
@@ -129,7 +129,7 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 129 |
'w' => 141.6,
|
| 130 |
),
|
| 131 |
),
|
| 132 |
-
|
| 133 |
1 => array(
|
| 134 |
'x' => 152.4,
|
| 135 |
'y' => 3.9,
|
|
@@ -151,7 +151,7 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 151 |
'w' => 141.6,
|
| 152 |
),
|
| 153 |
),
|
| 154 |
-
|
| 155 |
1 => array(
|
| 156 |
'x' => 152.4,
|
| 157 |
'y' => 3.9,
|
|
@@ -173,7 +173,7 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 173 |
'w' => 141.6,
|
| 174 |
),
|
| 175 |
),
|
| 176 |
-
|
| 177 |
1 => array(
|
| 178 |
'x' => 152.4,
|
| 179 |
'y' => 3.9,
|
|
@@ -195,7 +195,7 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 195 |
'w' => 141.6,
|
| 196 |
),
|
| 197 |
),
|
| 198 |
-
|
| 199 |
1 => array(
|
| 200 |
'x' => 0.5,
|
| 201 |
'y' => -277.6,
|
|
@@ -217,28 +217,28 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 217 |
'w' => 105.3,
|
| 218 |
),
|
| 219 |
),
|
| 220 |
-
|
| 221 |
array(
|
| 222 |
'x' => 2,
|
| 223 |
'y' => -39,
|
| 224 |
'w' => 103,
|
| 225 |
),
|
| 226 |
),
|
| 227 |
-
|
| 228 |
array(
|
| 229 |
'x' => 3.9,
|
| 230 |
'y' => 4.5,
|
| 231 |
'w' => 204.2,
|
| 232 |
),
|
| 233 |
),
|
| 234 |
-
|
| 235 |
array(
|
| 236 |
'x' => 3.9,
|
| 237 |
'y' => 4.5,
|
| 238 |
'w' => 204.2,
|
| 239 |
),
|
| 240 |
),
|
| 241 |
-
|
| 242 |
array(
|
| 243 |
'x' => 3.9,
|
| 244 |
'y' => 152.1,
|
|
@@ -518,8 +518,8 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 518 |
}
|
| 519 |
|
| 520 |
/**
|
| 521 |
-
* Creates a pdf containing both the packing slip and a shipping label. The shipping label must be of the
|
| 522 |
-
*
|
| 523 |
*
|
| 524 |
* @param TIG_PostNL_Model_Core_Shipment_Label $label
|
| 525 |
* @param string $packingSlip
|
|
@@ -548,15 +548,25 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 548 |
|
| 549 |
$pdf->insertTemplate($tempPackingslip, 0, 0);
|
| 550 |
|
| 551 |
-
if ($label->getLabelType() ==
|
| 552 |
-
|| $label->getLabelType() ==
|
| 553 |
-
|| $label->getLabelType() ==
|
| 554 |
) {
|
| 555 |
$pdf->Rotate(90);
|
| 556 |
$pdf->insertTemplate($tempLabel, $this->pix2pt(-1037), $this->pix2pt(413), $this->pix2pt(538));
|
| 557 |
$pdf->Rotate(0);
|
| 558 |
-
} elseif ($label->getLabelType() ==
|
| 559 |
-
$
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 560 |
} else {
|
| 561 |
throw new TIG_PostNL_Exception(
|
| 562 |
Mage::helper('postnl')->__(
|
|
@@ -648,19 +658,19 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 648 |
*/
|
| 649 |
$labelType = $label->getLabelType();
|
| 650 |
|
| 651 |
-
$
|
| 652 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 653 |
|
| 654 |
-
|
| 655 |
-
|
| 656 |
-
|
| 657 |
|
| 658 |
-
if ($labelType == 'Label'
|
| 659 |
-
|| $labelType == 'Label-combi'
|
| 660 |
-
|| $labelType == 'BusPakje'
|
| 661 |
-
|| $labelType == 'BusPakjeExtra'
|
| 662 |
-
|| $labelType == 'Return Label'
|
| 663 |
-
) {
|
| 664 |
if ($this->getLabelSize() == 'A4' && $this->getIsFirstLabel()) {
|
| 665 |
$pdf->addOrientedPage('L', 'A4');
|
| 666 |
$this->setIsFirstLabel(false);
|
|
@@ -683,11 +693,11 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 683 |
$this->setLabelCounter(3); //used to calculate the top left position
|
| 684 |
$pdf->addOrientedPage('L', 'A6');
|
| 685 |
}
|
| 686 |
-
} elseif ($labelType ==
|
| 687 |
$pdf->addOrientedPage('P', array(156.65, 73.85));
|
| 688 |
-
} elseif ($labelType ==
|
| 689 |
-
|| $labelType ==
|
| 690 |
-
|| $labelType ==
|
| 691 |
) {
|
| 692 |
$pdf->addOrientedPage('P', 'A4');
|
| 693 |
}
|
|
@@ -697,28 +707,37 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 697 |
* degrees.
|
| 698 |
*/
|
| 699 |
switch ($labelType) {
|
| 700 |
-
case
|
| 701 |
-
|
| 702 |
-
|
| 703 |
-
*/
|
| 704 |
-
$pdf->Rotate('-90');
|
| 705 |
|
| 706 |
-
$
|
|
|
|
|
|
|
|
|
|
|
|
|
| 707 |
|
| 708 |
-
|
| 709 |
|
| 710 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 711 |
break;
|
| 712 |
-
case
|
| 713 |
-
case
|
| 714 |
-
case
|
| 715 |
-
case
|
| 716 |
$position = $this->_getLabelPosition($labelType, $this->getLabelCounter());
|
| 717 |
|
| 718 |
$this->increaseLabelCounter();
|
| 719 |
break;
|
| 720 |
-
case
|
| 721 |
-
case
|
| 722 |
$position = $this->_getLabelPosition($labelType);
|
| 723 |
|
| 724 |
/**
|
|
@@ -726,7 +745,7 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 726 |
*/
|
| 727 |
$this->setLabelCounter(5);
|
| 728 |
break;
|
| 729 |
-
case
|
| 730 |
$position = $this->_getLabelPosition($labelType);
|
| 731 |
|
| 732 |
/**
|
|
@@ -734,7 +753,7 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 734 |
*/
|
| 735 |
$this->setLabelCounter(5);
|
| 736 |
break;
|
| 737 |
-
case
|
| 738 |
$pdf->Rotate('-90');
|
| 739 |
|
| 740 |
$position = $this->_getLabelPosition($labelType);
|
|
@@ -868,8 +887,13 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 868 |
}
|
| 869 |
|
| 870 |
/**
|
| 871 |
-
* Sorts labels by label type. First all labels of the
|
| 872 |
-
*
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 873 |
*
|
| 874 |
* @param array $labels
|
| 875 |
*
|
|
@@ -888,11 +912,11 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 888 |
/**
|
| 889 |
* Separate general labels from the rest.
|
| 890 |
*/
|
| 891 |
-
if ($label->getLabelType() ==
|
| 892 |
-
|| $label->getLabelType() ==
|
| 893 |
-
|| $label->getLabelType() ==
|
| 894 |
-
|| $label->getLabelType() ==
|
| 895 |
-
|| $label->getLabelType() ==
|
| 896 |
) {
|
| 897 |
$generalLabels[] = $label;
|
| 898 |
continue;
|
|
@@ -901,7 +925,7 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 901 |
/**
|
| 902 |
* Separate COD cards.
|
| 903 |
*/
|
| 904 |
-
if ($label->getLabelType() ==
|
| 905 |
$codCards[] = $label;
|
| 906 |
continue;
|
| 907 |
}
|
|
@@ -921,16 +945,18 @@ class TIG_PostNL_Model_Core_Label extends Varien_Object
|
|
| 921 |
*/
|
| 922 |
$sortedGlobalLabels = array();
|
| 923 |
foreach ($globalLabels as $shipmentLabels) {
|
| 924 |
-
if (isset($shipmentLabels[
|
| 925 |
-
$sortedGlobalLabels[] = $shipmentLabels[
|
| 926 |
}
|
| 927 |
|
| 928 |
-
if (isset($shipmentLabels[
|
| 929 |
-
$sortedGlobalLabels[] = $shipmentLabels[
|
| 930 |
}
|
| 931 |
|
| 932 |
-
if (isset($shipmentLabels[
|
| 933 |
-
$sortedGlobalLabels[] = $shipmentLabels[
|
|
|
|
|
|
|
| 934 |
}
|
| 935 |
}
|
| 936 |
|
| 62 |
/**
|
| 63 |
* Regex to determine whether a label is actually a combi-label.
|
| 64 |
*/
|
| 65 |
+
const COMBI_LABEL_REGEX = TIG_PostNL_Model_Core_Shipment_Label::COMBI_LABEL_REGEX;
|
| 66 |
|
| 67 |
/**
|
| 68 |
* An array of temporary files that have been created. these files will be destroyed at the end of the script.
|
| 107 |
* @var array
|
| 108 |
*/
|
| 109 |
protected $_labelPositions = array(
|
| 110 |
+
TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_LABEL => array(
|
| 111 |
1 => array(
|
| 112 |
'x' => 152.4,
|
| 113 |
'y' => 3.9,
|
| 129 |
'w' => 141.6,
|
| 130 |
),
|
| 131 |
),
|
| 132 |
+
TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_RETURN_LABEL => array(
|
| 133 |
1 => array(
|
| 134 |
'x' => 152.4,
|
| 135 |
'y' => 3.9,
|
| 151 |
'w' => 141.6,
|
| 152 |
),
|
| 153 |
),
|
| 154 |
+
TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_BUSPAKJE => array(
|
| 155 |
1 => array(
|
| 156 |
'x' => 152.4,
|
| 157 |
'y' => 3.9,
|
| 173 |
'w' => 141.6,
|
| 174 |
),
|
| 175 |
),
|
| 176 |
+
TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_BUSPAKJEEXTRA => array(
|
| 177 |
1 => array(
|
| 178 |
'x' => 152.4,
|
| 179 |
'y' => 3.9,
|
| 195 |
'w' => 141.6,
|
| 196 |
),
|
| 197 |
),
|
| 198 |
+
TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_LABEL_COMBI => array(
|
| 199 |
1 => array(
|
| 200 |
'x' => 0.5,
|
| 201 |
'y' => -277.6,
|
| 217 |
'w' => 105.3,
|
| 218 |
),
|
| 219 |
),
|
| 220 |
+
TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CODCARD => array(
|
| 221 |
array(
|
| 222 |
'x' => 2,
|
| 223 |
'y' => -39,
|
| 224 |
'w' => 103,
|
| 225 |
),
|
| 226 |
),
|
| 227 |
+
TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CN23 => array(
|
| 228 |
array(
|
| 229 |
'x' => 3.9,
|
| 230 |
'y' => 4.5,
|
| 231 |
'w' => 204.2,
|
| 232 |
),
|
| 233 |
),
|
| 234 |
+
TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_COMMERCIALINVOICE => array(
|
| 235 |
array(
|
| 236 |
'x' => 3.9,
|
| 237 |
'y' => 4.5,
|
| 238 |
'w' => 204.2,
|
| 239 |
),
|
| 240 |
),
|
| 241 |
+
TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CP71 => array(
|
| 242 |
array(
|
| 243 |
'x' => 3.9,
|
| 244 |
'y' => 152.1,
|
| 518 |
}
|
| 519 |
|
| 520 |
/**
|
| 521 |
+
* Creates a pdf containing both the packing slip and a shipping label. The shipping label must be of the TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_LABEL or
|
| 522 |
+
* TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_LABEL_COMBI type.
|
| 523 |
*
|
| 524 |
* @param TIG_PostNL_Model_Core_Shipment_Label $label
|
| 525 |
* @param string $packingSlip
|
| 548 |
|
| 549 |
$pdf->insertTemplate($tempPackingslip, 0, 0);
|
| 550 |
|
| 551 |
+
if ($label->getLabelType() == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_LABEL
|
| 552 |
+
|| $label->getLabelType() == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_BUSPAKJE
|
| 553 |
+
|| $label->getLabelType() == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_BUSPAKJEEXTRA
|
| 554 |
) {
|
| 555 |
$pdf->Rotate(90);
|
| 556 |
$pdf->insertTemplate($tempLabel, $this->pix2pt(-1037), $this->pix2pt(413), $this->pix2pt(538));
|
| 557 |
$pdf->Rotate(0);
|
| 558 |
+
} elseif ($label->getLabelType() == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_LABEL_COMBI) {
|
| 559 |
+
$contents = file_get_contents($tempLabel);
|
| 560 |
+
preg_match(self::COMBI_LABEL_REGEX, $contents, $matches);
|
| 561 |
+
|
| 562 |
+
if (isset($matches[1]) && isset($matches[2]) && $matches[1] < $matches[2]) {
|
| 563 |
+
// combilabel detected
|
| 564 |
+
$pdf->insertTemplate($tempLabel, $this->pix2pt(400), $this->pix2pt(569), $this->pix2pt(400));
|
| 565 |
+
} else {
|
| 566 |
+
$pdf->Rotate(90);
|
| 567 |
+
$pdf->insertTemplate($tempLabel, $this->pix2pt(-1037), $this->pix2pt(413), $this->pix2pt(538));
|
| 568 |
+
$pdf->Rotate(0);
|
| 569 |
+
}
|
| 570 |
} else {
|
| 571 |
throw new TIG_PostNL_Exception(
|
| 572 |
Mage::helper('postnl')->__(
|
| 658 |
*/
|
| 659 |
$labelType = $label->getLabelType();
|
| 660 |
|
| 661 |
+
if ($labelType == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_LABEL
|
| 662 |
+
|| $labelType == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_LABEL_COMBI
|
| 663 |
+
|| $labelType == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_BUSPAKJE
|
| 664 |
+
|| $labelType == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_BUSPAKJEEXTRA
|
| 665 |
+
|| $labelType == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_RETURN_LABEL
|
| 666 |
+
) {
|
| 667 |
+
$contents = file_get_contents($tempFilename);
|
| 668 |
+
preg_match(self::COMBI_LABEL_REGEX, $contents, $matches);
|
| 669 |
|
| 670 |
+
if (isset($matches[1]) && isset($matches[2]) && $matches[1] < $matches[2]) {
|
| 671 |
+
$labelType = TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_LABEL_COMBI;
|
| 672 |
+
}
|
| 673 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 674 |
if ($this->getLabelSize() == 'A4' && $this->getIsFirstLabel()) {
|
| 675 |
$pdf->addOrientedPage('L', 'A4');
|
| 676 |
$this->setIsFirstLabel(false);
|
| 693 |
$this->setLabelCounter(3); //used to calculate the top left position
|
| 694 |
$pdf->addOrientedPage('L', 'A6');
|
| 695 |
}
|
| 696 |
+
} elseif ($labelType == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CODCARD) {
|
| 697 |
$pdf->addOrientedPage('P', array(156.65, 73.85));
|
| 698 |
+
} elseif ($labelType == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CN23
|
| 699 |
+
|| $labelType == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_COMMERCIALINVOICE
|
| 700 |
+
|| $labelType == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CODCARD
|
| 701 |
) {
|
| 702 |
$pdf->addOrientedPage('P', 'A4');
|
| 703 |
}
|
| 707 |
* degrees.
|
| 708 |
*/
|
| 709 |
switch ($labelType) {
|
| 710 |
+
case TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_LABEL_COMBI:
|
| 711 |
+
$contents = file_get_contents($tempFilename);
|
| 712 |
+
preg_match(self::COMBI_LABEL_REGEX, $contents, $matches);
|
|
|
|
|
|
|
| 713 |
|
| 714 |
+
if (isset($matches[1]) && isset($matches[2]) && $matches[1] < $matches[2]) {
|
| 715 |
+
/**
|
| 716 |
+
* Rotate the pdf to accommodate the rotated combi-label.
|
| 717 |
+
*/
|
| 718 |
+
$pdf->Rotate('-90');
|
| 719 |
|
| 720 |
+
$position = $this->_getLabelPosition($labelType, $this->getLabelCounter());
|
| 721 |
|
| 722 |
+
$this->increaseLabelCounter();
|
| 723 |
+
|
| 724 |
+
$rotate = true;
|
| 725 |
+
} else {
|
| 726 |
+
$position = $this->_getLabelPosition($labelType, $this->getLabelCounter());
|
| 727 |
+
|
| 728 |
+
$this->increaseLabelCounter();
|
| 729 |
+
}
|
| 730 |
break;
|
| 731 |
+
case TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_LABEL:
|
| 732 |
+
case TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_BUSPAKJE:
|
| 733 |
+
case TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_BUSPAKJEEXTRA:
|
| 734 |
+
case TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_RETURN_LABEL:
|
| 735 |
$position = $this->_getLabelPosition($labelType, $this->getLabelCounter());
|
| 736 |
|
| 737 |
$this->increaseLabelCounter();
|
| 738 |
break;
|
| 739 |
+
case TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CN23:
|
| 740 |
+
case TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_COMMERCIALINVOICE:
|
| 741 |
$position = $this->_getLabelPosition($labelType);
|
| 742 |
|
| 743 |
/**
|
| 745 |
*/
|
| 746 |
$this->setLabelCounter(5);
|
| 747 |
break;
|
| 748 |
+
case TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CP71:
|
| 749 |
$position = $this->_getLabelPosition($labelType);
|
| 750 |
|
| 751 |
/**
|
| 753 |
*/
|
| 754 |
$this->setLabelCounter(5);
|
| 755 |
break;
|
| 756 |
+
case TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CODCARD:
|
| 757 |
$pdf->Rotate('-90');
|
| 758 |
|
| 759 |
$position = $this->_getLabelPosition($labelType);
|
| 887 |
}
|
| 888 |
|
| 889 |
/**
|
| 890 |
+
* Sorts labels by label type. First all labels of the TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_LABEL,
|
| 891 |
+
* TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_LABEL_COMBI,
|
| 892 |
+
* TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_BUSPAKJE and
|
| 893 |
+
* TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_BUSPAKJEEXTRA' type.
|
| 894 |
+
* Then all other labels in the order of TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CODCARD >
|
| 895 |
+
* TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CN23 > TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CP71 >
|
| 896 |
+
* TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_COMMERCIALINVOICE grouped by shipments.
|
| 897 |
*
|
| 898 |
* @param array $labels
|
| 899 |
*
|
| 912 |
/**
|
| 913 |
* Separate general labels from the rest.
|
| 914 |
*/
|
| 915 |
+
if ($label->getLabelType() == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_LABEL
|
| 916 |
+
|| $label->getLabelType() == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_LABEL_COMBI
|
| 917 |
+
|| $label->getLabelType() == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_BUSPAKJE
|
| 918 |
+
|| $label->getLabelType() == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_BUSPAKJEEXTRA
|
| 919 |
+
|| $label->getLabelType() == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_RETURN_LABEL
|
| 920 |
) {
|
| 921 |
$generalLabels[] = $label;
|
| 922 |
continue;
|
| 925 |
/**
|
| 926 |
* Separate COD cards.
|
| 927 |
*/
|
| 928 |
+
if ($label->getLabelType() == TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CODCARD) {
|
| 929 |
$codCards[] = $label;
|
| 930 |
continue;
|
| 931 |
}
|
| 945 |
*/
|
| 946 |
$sortedGlobalLabels = array();
|
| 947 |
foreach ($globalLabels as $shipmentLabels) {
|
| 948 |
+
if (isset($shipmentLabels[TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CN23])) {
|
| 949 |
+
$sortedGlobalLabels[] = $shipmentLabels[TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CN23];
|
| 950 |
}
|
| 951 |
|
| 952 |
+
if (isset($shipmentLabels[TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CP71])) {
|
| 953 |
+
$sortedGlobalLabels[] = $shipmentLabels[TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_CP71];
|
| 954 |
}
|
| 955 |
|
| 956 |
+
if (isset($shipmentLabels[TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_COMMERCIALINVOICE])) {
|
| 957 |
+
$sortedGlobalLabels[] = $shipmentLabels[
|
| 958 |
+
TIG_PostNL_Model_Core_Shipment_Label::LABEL_TYPE_COMMERCIALINVOICE
|
| 959 |
+
];
|
| 960 |
}
|
| 961 |
}
|
| 962 |
|
app/code/community/TIG/PostNL/Model/Core/PackingSlip.php
CHANGED
|
@@ -287,8 +287,25 @@ class TIG_PostNL_Model_Core_PackingSlip extends Mage_Sales_Model_Order_Pdf_Abstr
|
|
| 287 |
$labelsString = $labelModel->createPackingSlipLabel(array_shift($labels), $packingSlipString);
|
| 288 |
|
| 289 |
$pdf = Zend_Pdf::parse($labelsString);
|
| 290 |
-
|
| 291 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 292 |
}
|
| 293 |
|
| 294 |
if (count($labels) > 0) {
|
|
@@ -774,13 +791,15 @@ class TIG_PostNL_Model_Core_PackingSlip extends Mage_Sales_Model_Order_Pdf_Abstr
|
|
| 774 |
|
| 775 |
$top -= 10;
|
| 776 |
|
| 777 |
-
|
| 778 |
-
|
| 779 |
-
|
| 780 |
-
|
| 781 |
-
|
|
|
|
| 782 |
|
| 783 |
-
|
|
|
|
| 784 |
}
|
| 785 |
|
| 786 |
if ($this->getConfig('show_shipping_date')) {
|
|
@@ -1214,7 +1233,7 @@ class TIG_PostNL_Model_Core_PackingSlip extends Mage_Sales_Model_Order_Pdf_Abstr
|
|
| 1214 |
$total->setFontSize(10);
|
| 1215 |
foreach ($total->getTotalsForDisplay() as $totalData) {
|
| 1216 |
$label = array(
|
| 1217 |
-
'text'
|
| 1218 |
'feed' => 495,
|
| 1219 |
'align' => 'right',
|
| 1220 |
'font_size' => 8,
|
|
@@ -1501,4 +1520,4 @@ class TIG_PostNL_Model_Core_PackingSlip extends Mage_Sales_Model_Order_Pdf_Abstr
|
|
| 1501 |
|
| 1502 |
return $page;
|
| 1503 |
}
|
| 1504 |
-
}
|
| 287 |
$labelsString = $labelModel->createPackingSlipLabel(array_shift($labels), $packingSlipString);
|
| 288 |
|
| 289 |
$pdf = Zend_Pdf::parse($labelsString);
|
| 290 |
+
|
| 291 |
+
/*
|
| 292 |
+
* Due to a problem with cloning Label-combi's in
|
| 293 |
+
* lib/Zend/Pdf/Element/Dictionary.php method makeClone()
|
| 294 |
+
* a work around
|
| 295 |
+
*/
|
| 296 |
+
if ($firstLabel->getLabelType() == 'Label-combi') {
|
| 297 |
+
//switch labelString document to mainPdf document
|
| 298 |
+
$tempPdf = $mainPdf;
|
| 299 |
+
$mainPdf = $pdf;
|
| 300 |
+
|
| 301 |
+
foreach($tempPdf->pages as $page) {
|
| 302 |
+
$mainPdf->pages[] = clone $page;
|
| 303 |
+
}
|
| 304 |
+
} else {
|
| 305 |
+
//normal flow
|
| 306 |
+
foreach($pdf->pages as $page) {
|
| 307 |
+
$mainPdf->pages[] = clone $page;
|
| 308 |
+
}
|
| 309 |
}
|
| 310 |
|
| 311 |
if (count($labels) > 0) {
|
| 791 |
|
| 792 |
$top -= 10;
|
| 793 |
|
| 794 |
+
if ($postnlShipment->isDomesticShipment()) {
|
| 795 |
+
$deliveryDate = $postnlShipment->getDeliveryDate();
|
| 796 |
+
/** @noinspection PhpParamsInspection */
|
| 797 |
+
$text = $this->getCoreHelper()->formatDate($deliveryDate, 'full', false);
|
| 798 |
+
$x = 580 - $this->widthForStringUsingFontSize($text, $font, 8);
|
| 799 |
+
$page->drawText($text, $x, $top, 'UTF-8');
|
| 800 |
|
| 801 |
+
$top -= 24;
|
| 802 |
+
}
|
| 803 |
}
|
| 804 |
|
| 805 |
if ($this->getConfig('show_shipping_date')) {
|
| 1233 |
$total->setFontSize(10);
|
| 1234 |
foreach ($total->getTotalsForDisplay() as $totalData) {
|
| 1235 |
$label = array(
|
| 1236 |
+
'text' => $this->getHelper()->__($totalData['label']),
|
| 1237 |
'feed' => 495,
|
| 1238 |
'align' => 'right',
|
| 1239 |
'font_size' => 8,
|
| 1520 |
|
| 1521 |
return $page;
|
| 1522 |
}
|
| 1523 |
+
}
|
app/code/community/TIG/PostNL/Model/Core/Shipment.php
CHANGED
|
@@ -98,6 +98,7 @@
|
|
| 98 |
* @method bool|int getIsPakketautomaat()
|
| 99 |
* @method boolean getIsBuspakjeShipment()
|
| 100 |
* @method boolean getIsSundayShipment()
|
|
|
|
| 101 |
* @method int getReturnLabelsPrinted()
|
| 102 |
* @method string getExpectedDeliveryTimeStart()
|
| 103 |
* @method string getExpectedDeliveryTimeEnd()
|
|
@@ -134,6 +135,7 @@
|
|
| 134 |
* @method TIG_PostNL_Model_Core_Shipment setShipmentIncrementId(string $value)
|
| 135 |
* @method TIG_PostNL_Model_Core_Shipment setIsBuspakjeShipment(bool $value)
|
| 136 |
* @method TIG_PostNL_Model_Core_Shipment setIsSundayShipment(bool $value)
|
|
|
|
| 137 |
* @method TIG_PostNL_Model_Core_Shipment setDefaultProductCode(string $value)
|
| 138 |
* @method TIG_PostNL_Model_Core_Shipment setLabels(mixed $value)
|
| 139 |
* @method TIG_PostNL_Model_Core_Shipment setProductOption(string $value)
|
|
@@ -165,6 +167,7 @@
|
|
| 165 |
* @method boolean hasShipmentIncrementId()
|
| 166 |
* @method boolean hasIsBuspakjeShipment()
|
| 167 |
* @method boolean hasIsSundayShipment()
|
|
|
|
| 168 |
* @method boolean hasDefaultProductCode()
|
| 169 |
* @method boolean hasProductOption()
|
| 170 |
* @method boolean hasPayment()
|
|
@@ -214,6 +217,7 @@ class TIG_PostNL_Model_Core_Shipment extends Mage_Core_Model_Abstract
|
|
| 214 |
const SHIPMENT_TYPE_GLOBALPACK = 'globalpack';
|
| 215 |
const SHIPMENT_TYPE_BUSPAKJE = 'buspakje';
|
| 216 |
const SHIPMENT_TYPE_SUNDAY = 'sunday';
|
|
|
|
| 217 |
|
| 218 |
/**
|
| 219 |
* Xpaths to default product options settings.
|
|
@@ -649,13 +653,14 @@ class TIG_PostNL_Model_Core_Shipment extends Mage_Core_Model_Abstract
|
|
| 649 |
*/
|
| 650 |
public function getCustomBarcodes()
|
| 651 |
{
|
| 652 |
-
if ($this->_customBarcodes) {
|
| 653 |
return $this->_customBarcodes;
|
| 654 |
}
|
| 655 |
|
| 656 |
$customBarcodes = $this->getHelper()->getCustomBarcodes();
|
| 657 |
|
| 658 |
$this->_customBarcodes = $customBarcodes;
|
|
|
|
| 659 |
return $customBarcodes;
|
| 660 |
}
|
| 661 |
|
|
@@ -797,6 +802,10 @@ class TIG_PostNL_Model_Core_Shipment extends Mage_Core_Model_Abstract
|
|
| 797 |
return self::SHIPMENT_TYPE_SUNDAY;
|
| 798 |
}
|
| 799 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 800 |
if ($this->isDomesticShipment()) {
|
| 801 |
return self::SHIPMENT_TYPE_DOMESTIC;
|
| 802 |
}
|
|
@@ -1569,6 +1578,7 @@ class TIG_PostNL_Model_Core_Shipment extends Mage_Core_Model_Abstract
|
|
| 1569 |
$shipmentType = $this->getShipmentType($checkBuspakje);
|
| 1570 |
switch ($shipmentType) {
|
| 1571 |
case self::SHIPMENT_TYPE_DOMESTIC:
|
|
|
|
| 1572 |
$allowedProductCodes = $cifHelper->getStandardProductCodes($flat);
|
| 1573 |
break;
|
| 1574 |
case self::SHIPMENT_TYPE_DOMESTIC_COD:
|
|
@@ -2413,6 +2423,23 @@ class TIG_PostNL_Model_Core_Shipment extends Mage_Core_Model_Abstract
|
|
| 2413 |
return $isSunday;
|
| 2414 |
}
|
| 2415 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2416 |
/**
|
| 2417 |
* Checks if the order of this shipment is a Sunday order.
|
| 2418 |
*
|
|
@@ -2428,6 +2455,21 @@ class TIG_PostNL_Model_Core_Shipment extends Mage_Core_Model_Abstract
|
|
| 2428 |
return false;
|
| 2429 |
}
|
| 2430 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2431 |
/**
|
| 2432 |
* Checks if this shipment is a COD shipment.
|
| 2433 |
*
|
|
@@ -3305,7 +3347,7 @@ class TIG_PostNL_Model_Core_Shipment extends Mage_Core_Model_Abstract
|
|
| 3305 |
/**
|
| 3306 |
* If this is an EU shipment and a non-combi label was returned, the product code needs to be updated.
|
| 3307 |
*/
|
| 3308 |
-
if ($this->isEuShipment() && !$this->
|
| 3309 |
$this->setProductCode($shipment->ProductCodeDelivery);
|
| 3310 |
}
|
| 3311 |
|
|
@@ -4134,7 +4176,10 @@ class TIG_PostNL_Model_Core_Shipment extends Mage_Core_Model_Abstract
|
|
| 4134 |
$url = '';
|
| 4135 |
$shippingAddress = $this->getShippingAddress();
|
| 4136 |
if ($shippingAddress) {
|
| 4137 |
-
|
|
|
|
|
|
|
|
|
|
| 4138 |
}
|
| 4139 |
|
| 4140 |
return $url;
|
|
@@ -4182,7 +4227,7 @@ class TIG_PostNL_Model_Core_Shipment extends Mage_Core_Model_Abstract
|
|
| 4182 |
{
|
| 4183 |
$labelType = $label->Labeltype;
|
| 4184 |
|
| 4185 |
-
if ($this->
|
| 4186 |
$labelType = 'Label-combi';
|
| 4187 |
}
|
| 4188 |
|
|
@@ -4269,7 +4314,7 @@ class TIG_PostNL_Model_Core_Shipment extends Mage_Core_Model_Abstract
|
|
| 4269 |
*
|
| 4270 |
* @return boolean
|
| 4271 |
*/
|
| 4272 |
-
protected function
|
| 4273 |
{
|
| 4274 |
if (!$this->isEuShipment()) {
|
| 4275 |
return false;
|
|
@@ -4674,6 +4719,13 @@ class TIG_PostNL_Model_Core_Shipment extends Mage_Core_Model_Abstract
|
|
| 4674 |
{
|
| 4675 |
$shipmentType = $this->getShipmentType(false);
|
| 4676 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 4677 |
/**
|
| 4678 |
* If this is a domestic shipment and the shipment has been marked as 'buspakje', update the shipment type. If
|
| 4679 |
* no buspakje field was entered or the field has a value of -1, automatically determine whether this shipment
|
|
@@ -4688,7 +4740,6 @@ class TIG_PostNL_Model_Core_Shipment extends Mage_Core_Model_Abstract
|
|
| 4688 |
&& (!isset($codes['is_buspakje'])
|
| 4689 |
|| $codes['is_buspakje'] == '-1'
|
| 4690 |
)
|
| 4691 |
-
&& false
|
| 4692 |
) {
|
| 4693 |
$isBuspakje = $this->_getIsBuspakje();
|
| 4694 |
} else {
|
|
@@ -5308,4 +5359,4 @@ class TIG_PostNL_Model_Core_Shipment extends Mage_Core_Model_Abstract
|
|
| 5308 |
|
| 5309 |
return parent::save();
|
| 5310 |
}
|
| 5311 |
-
}
|
| 98 |
* @method bool|int getIsPakketautomaat()
|
| 99 |
* @method boolean getIsBuspakjeShipment()
|
| 100 |
* @method boolean getIsSundayShipment()
|
| 101 |
+
* @method boolean getIsMondayShipment()
|
| 102 |
* @method int getReturnLabelsPrinted()
|
| 103 |
* @method string getExpectedDeliveryTimeStart()
|
| 104 |
* @method string getExpectedDeliveryTimeEnd()
|
| 135 |
* @method TIG_PostNL_Model_Core_Shipment setShipmentIncrementId(string $value)
|
| 136 |
* @method TIG_PostNL_Model_Core_Shipment setIsBuspakjeShipment(bool $value)
|
| 137 |
* @method TIG_PostNL_Model_Core_Shipment setIsSundayShipment(bool $value)
|
| 138 |
+
* @method TIG_PostNL_Model_Core_Shipment setIsMondayShipment(bool $value)
|
| 139 |
* @method TIG_PostNL_Model_Core_Shipment setDefaultProductCode(string $value)
|
| 140 |
* @method TIG_PostNL_Model_Core_Shipment setLabels(mixed $value)
|
| 141 |
* @method TIG_PostNL_Model_Core_Shipment setProductOption(string $value)
|
| 167 |
* @method boolean hasShipmentIncrementId()
|
| 168 |
* @method boolean hasIsBuspakjeShipment()
|
| 169 |
* @method boolean hasIsSundayShipment()
|
| 170 |
+
* @method boolean hasIsMondayShipment()
|
| 171 |
* @method boolean hasDefaultProductCode()
|
| 172 |
* @method boolean hasProductOption()
|
| 173 |
* @method boolean hasPayment()
|
| 217 |
const SHIPMENT_TYPE_GLOBALPACK = 'globalpack';
|
| 218 |
const SHIPMENT_TYPE_BUSPAKJE = 'buspakje';
|
| 219 |
const SHIPMENT_TYPE_SUNDAY = 'sunday';
|
| 220 |
+
const SHIPMENT_TYPE_MONDAY = 'monday';
|
| 221 |
|
| 222 |
/**
|
| 223 |
* Xpaths to default product options settings.
|
| 653 |
*/
|
| 654 |
public function getCustomBarcodes()
|
| 655 |
{
|
| 656 |
+
if ( $this->_customBarcodes ) {
|
| 657 |
return $this->_customBarcodes;
|
| 658 |
}
|
| 659 |
|
| 660 |
$customBarcodes = $this->getHelper()->getCustomBarcodes();
|
| 661 |
|
| 662 |
$this->_customBarcodes = $customBarcodes;
|
| 663 |
+
|
| 664 |
return $customBarcodes;
|
| 665 |
}
|
| 666 |
|
| 802 |
return self::SHIPMENT_TYPE_SUNDAY;
|
| 803 |
}
|
| 804 |
|
| 805 |
+
if ($this->isMondayShipment()) {
|
| 806 |
+
return self::SHIPMENT_TYPE_MONDAY;
|
| 807 |
+
}
|
| 808 |
+
|
| 809 |
if ($this->isDomesticShipment()) {
|
| 810 |
return self::SHIPMENT_TYPE_DOMESTIC;
|
| 811 |
}
|
| 1578 |
$shipmentType = $this->getShipmentType($checkBuspakje);
|
| 1579 |
switch ($shipmentType) {
|
| 1580 |
case self::SHIPMENT_TYPE_DOMESTIC:
|
| 1581 |
+
case self::SHIPMENT_TYPE_MONDAY:
|
| 1582 |
$allowedProductCodes = $cifHelper->getStandardProductCodes($flat);
|
| 1583 |
break;
|
| 1584 |
case self::SHIPMENT_TYPE_DOMESTIC_COD:
|
| 2423 |
return $isSunday;
|
| 2424 |
}
|
| 2425 |
|
| 2426 |
+
/**
|
| 2427 |
+
* Check if this shipment is a monday shipment.
|
| 2428 |
+
*
|
| 2429 |
+
* @return boolean
|
| 2430 |
+
*/
|
| 2431 |
+
public function isMondayShipment()
|
| 2432 |
+
{
|
| 2433 |
+
if ($this->hasIsMondayShipment()) {
|
| 2434 |
+
return $this->getIsMondayShipment();
|
| 2435 |
+
}
|
| 2436 |
+
|
| 2437 |
+
$isMonday = $this->isMonday();
|
| 2438 |
+
|
| 2439 |
+
$this->setIsMondayShipment($isMonday);
|
| 2440 |
+
return $isMonday;
|
| 2441 |
+
}
|
| 2442 |
+
|
| 2443 |
/**
|
| 2444 |
* Checks if the order of this shipment is a Sunday order.
|
| 2445 |
*
|
| 2455 |
return false;
|
| 2456 |
}
|
| 2457 |
|
| 2458 |
+
/**
|
| 2459 |
+
* Checks if the order of this shipment is a Monday order.
|
| 2460 |
+
*
|
| 2461 |
+
* @return bool
|
| 2462 |
+
*/
|
| 2463 |
+
public function isMonday()
|
| 2464 |
+
{
|
| 2465 |
+
$postnlOrder = $this->getPostnlOrder();
|
| 2466 |
+
if ($postnlOrder && $postnlOrder->getType() == 'Monday') {
|
| 2467 |
+
return true;
|
| 2468 |
+
}
|
| 2469 |
+
|
| 2470 |
+
return false;
|
| 2471 |
+
}
|
| 2472 |
+
|
| 2473 |
/**
|
| 2474 |
* Checks if this shipment is a COD shipment.
|
| 2475 |
*
|
| 3347 |
/**
|
| 3348 |
* If this is an EU shipment and a non-combi label was returned, the product code needs to be updated.
|
| 3349 |
*/
|
| 3350 |
+
if ($this->isEuShipment() && !$this->_isCombiLabelShipment()) {
|
| 3351 |
$this->setProductCode($shipment->ProductCodeDelivery);
|
| 3352 |
}
|
| 3353 |
|
| 4176 |
$url = '';
|
| 4177 |
$shippingAddress = $this->getShippingAddress();
|
| 4178 |
if ($shippingAddress) {
|
| 4179 |
+
if ($forceNl) {
|
| 4180 |
+
$lang = 'NL';
|
| 4181 |
+
}
|
| 4182 |
+
$url = $helper->getBarcodeUrl($barcode, $shippingAddress, $lang);
|
| 4183 |
}
|
| 4184 |
|
| 4185 |
return $url;
|
| 4227 |
{
|
| 4228 |
$labelType = $label->Labeltype;
|
| 4229 |
|
| 4230 |
+
if ($this->_isCombiLabelShipment()) {
|
| 4231 |
$labelType = 'Label-combi';
|
| 4232 |
}
|
| 4233 |
|
| 4314 |
*
|
| 4315 |
* @return boolean
|
| 4316 |
*/
|
| 4317 |
+
protected function _isCombiLabelShipment()
|
| 4318 |
{
|
| 4319 |
if (!$this->isEuShipment()) {
|
| 4320 |
return false;
|
| 4719 |
{
|
| 4720 |
$shipmentType = $this->getShipmentType(false);
|
| 4721 |
|
| 4722 |
+
/**
|
| 4723 |
+
* For extracting the product code, monday shipments are considered domestic.
|
| 4724 |
+
*/
|
| 4725 |
+
if ($shipmentType == self::SHIPMENT_TYPE_MONDAY) {
|
| 4726 |
+
$shipmentType = self::SHIPMENT_TYPE_DOMESTIC;
|
| 4727 |
+
}
|
| 4728 |
+
|
| 4729 |
/**
|
| 4730 |
* If this is a domestic shipment and the shipment has been marked as 'buspakje', update the shipment type. If
|
| 4731 |
* no buspakje field was entered or the field has a value of -1, automatically determine whether this shipment
|
| 4740 |
&& (!isset($codes['is_buspakje'])
|
| 4741 |
|| $codes['is_buspakje'] == '-1'
|
| 4742 |
)
|
|
|
|
| 4743 |
) {
|
| 4744 |
$isBuspakje = $this->_getIsBuspakje();
|
| 4745 |
} else {
|
| 5359 |
|
| 5360 |
return parent::save();
|
| 5361 |
}
|
| 5362 |
+
}
|
app/code/community/TIG/PostNL/Model/Core/Shipment/Label.php
CHANGED
|
@@ -48,6 +48,24 @@
|
|
| 48 |
*/
|
| 49 |
class TIG_PostNL_Model_Core_Shipment_Label extends Mage_Core_Model_Abstract
|
| 50 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 51 |
/**
|
| 52 |
* Prefix of model events names
|
| 53 |
*
|
|
@@ -103,4 +121,38 @@ class TIG_PostNL_Model_Core_Shipment_Label extends Mage_Core_Model_Abstract
|
|
| 103 |
|
| 104 |
return false;
|
| 105 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 106 |
}
|
| 48 |
*/
|
| 49 |
class TIG_PostNL_Model_Core_Shipment_Label extends Mage_Core_Model_Abstract
|
| 50 |
{
|
| 51 |
+
/**
|
| 52 |
+
* Supported label types.
|
| 53 |
+
*/
|
| 54 |
+
const LABEL_TYPE_LABEL = 'Label';
|
| 55 |
+
const LABEL_TYPE_RETURN_LABEL = 'Return label';
|
| 56 |
+
const LABEL_TYPE_BUSPAKJE = 'Buspakje';
|
| 57 |
+
const LABEL_TYPE_BUSPAKJEEXTRA = 'BusPakjeExtra';
|
| 58 |
+
const LABEL_TYPE_LABEL_COMBI = 'Label-combi';
|
| 59 |
+
const LABEL_TYPE_CODCARD = 'CODcard';
|
| 60 |
+
const LABEL_TYPE_CN23 = 'CN23';
|
| 61 |
+
const LABEL_TYPE_COMMERCIALINVOICE = 'CommercialInvoice';
|
| 62 |
+
const LABEL_TYPE_CP71 = 'CP71';
|
| 63 |
+
|
| 64 |
+
/**
|
| 65 |
+
* Regex to determine whether a label is actually a combi-label.
|
| 66 |
+
*/
|
| 67 |
+
const COMBI_LABEL_REGEX = '#/MediaBox \[0 0 ([\d]+) ([\d]+) \]#';
|
| 68 |
+
|
| 69 |
/**
|
| 70 |
* Prefix of model events names
|
| 71 |
*
|
| 121 |
|
| 122 |
return false;
|
| 123 |
}
|
| 124 |
+
|
| 125 |
+
/**
|
| 126 |
+
* Determine whether this label is a combi-label or not.
|
| 127 |
+
*
|
| 128 |
+
* @return bool
|
| 129 |
+
*/
|
| 130 |
+
public function isCombiLabel()
|
| 131 |
+
{
|
| 132 |
+
$labelType = $this->getLabelType();
|
| 133 |
+
|
| 134 |
+
if ($labelType != self::LABEL_TYPE_LABEL && $labelType != self::LABEL_TYPE_LABEL_COMBI) {
|
| 135 |
+
return false;
|
| 136 |
+
}
|
| 137 |
+
|
| 138 |
+
$labelContent = $this->getLabel(true);
|
| 139 |
+
preg_match(self::COMBI_LABEL_REGEX, $labelContent, $matches);
|
| 140 |
+
if (isset($matches[1]) && isset($matches[2]) && $matches[1] < $matches[2]) {
|
| 141 |
+
return true;
|
| 142 |
+
}
|
| 143 |
+
|
| 144 |
+
return false;
|
| 145 |
+
}
|
| 146 |
+
|
| 147 |
+
/**
|
| 148 |
+
* @return Mage_Core_Model_Abstract
|
| 149 |
+
*/
|
| 150 |
+
protected function _beforeSave()
|
| 151 |
+
{
|
| 152 |
+
if ($this->getLabelType() == self::LABEL_TYPE_LABEL_COMBI && !$this->isCombiLabel()) {
|
| 153 |
+
$this->setLabelType(self::LABEL_TYPE_LABEL);
|
| 154 |
+
}
|
| 155 |
+
|
| 156 |
+
return parent::_beforeSave();
|
| 157 |
+
}
|
| 158 |
}
|
app/code/community/TIG/PostNL/Model/Core/Shipment/Process.php
CHANGED
|
@@ -187,7 +187,7 @@ class TIG_PostNL_Model_Core_Shipment_Process extends Mage_Index_Model_Process
|
|
| 187 |
$varDir = Mage::getConfig()->getVarDir('locks');
|
| 188 |
$file = $varDir . DS . 'postnl_process_'.$this->getId().'.lock';
|
| 189 |
|
| 190 |
-
if(!is_file($file)){
|
| 191 |
return false;
|
| 192 |
}
|
| 193 |
|
| 187 |
$varDir = Mage::getConfig()->getVarDir('locks');
|
| 188 |
$file = $varDir . DS . 'postnl_process_'.$this->getId().'.lock';
|
| 189 |
|
| 190 |
+
if (!is_file($file) || !is_readable($file)) {
|
| 191 |
return false;
|
| 192 |
}
|
| 193 |
|
app/code/community/TIG/PostNL/Model/Core/System/Config/Source/AllProductOptions.php
CHANGED
|
@@ -132,6 +132,7 @@ class TIG_PostNL_Model_Core_System_Config_Source_AllProductOptions
|
|
| 132 |
'isCod' => false,
|
| 133 |
'statedAddressOnly' => true,
|
| 134 |
'isBelgiumOnly' => false,
|
|
|
|
| 135 |
'group' => 'standard_options',
|
| 136 |
),
|
| 137 |
'3389' => array(
|
|
@@ -153,6 +154,7 @@ class TIG_PostNL_Model_Core_System_Config_Source_AllProductOptions
|
|
| 153 |
'isCod' => false,
|
| 154 |
'statedAddressOnly' => true,
|
| 155 |
'isBelgiumOnly' => false,
|
|
|
|
| 156 |
'group' => 'standard_options',
|
| 157 |
),
|
| 158 |
'3090' => array(
|
|
@@ -297,9 +299,8 @@ class TIG_PostNL_Model_Core_System_Config_Source_AllProductOptions
|
|
| 297 |
'4945' => array(
|
| 298 |
'value' => '4945',
|
| 299 |
'label' => 'GlobalPack',
|
| 300 |
-
'isExtraCover' =>
|
| 301 |
'isSunday' => false,
|
| 302 |
-
'extraCover' => 200,
|
| 303 |
'countryLimitation' => false,
|
| 304 |
'group' => 'global_options',
|
| 305 |
),
|
|
@@ -315,7 +316,7 @@ class TIG_PostNL_Model_Core_System_Config_Source_AllProductOptions
|
|
| 315 |
'value' => '2828',
|
| 316 |
'label' => 'Letter Box Parcel',
|
| 317 |
'isExtraCover' => false,
|
| 318 |
-
'isSunday'
|
| 319 |
'countryLimitation' => 'NL',
|
| 320 |
'group' => 'buspakje_options',
|
| 321 |
),
|
|
@@ -451,6 +452,9 @@ class TIG_PostNL_Model_Core_System_Config_Source_AllProductOptions
|
|
| 451 |
&& (!isset($flags['group'])
|
| 452 |
|| $flags['group'] == 'eu_options'
|
| 453 |
)
|
|
|
|
|
|
|
|
|
|
| 454 |
) {
|
| 455 |
if (!$asFlatArray) {
|
| 456 |
$options['4955'] = array(
|
| 132 |
'isCod' => false,
|
| 133 |
'statedAddressOnly' => true,
|
| 134 |
'isBelgiumOnly' => false,
|
| 135 |
+
'countryLimitation' => 'NL',
|
| 136 |
'group' => 'standard_options',
|
| 137 |
),
|
| 138 |
'3389' => array(
|
| 154 |
'isCod' => false,
|
| 155 |
'statedAddressOnly' => true,
|
| 156 |
'isBelgiumOnly' => false,
|
| 157 |
+
'countryLimitation' => 'NL',
|
| 158 |
'group' => 'standard_options',
|
| 159 |
),
|
| 160 |
'3090' => array(
|
| 299 |
'4945' => array(
|
| 300 |
'value' => '4945',
|
| 301 |
'label' => 'GlobalPack',
|
| 302 |
+
'isExtraCover' => false,
|
| 303 |
'isSunday' => false,
|
|
|
|
| 304 |
'countryLimitation' => false,
|
| 305 |
'group' => 'global_options',
|
| 306 |
),
|
| 316 |
'value' => '2828',
|
| 317 |
'label' => 'Letter Box Parcel',
|
| 318 |
'isExtraCover' => false,
|
| 319 |
+
'isSunday' => false,
|
| 320 |
'countryLimitation' => 'NL',
|
| 321 |
'group' => 'buspakje_options',
|
| 322 |
),
|
| 452 |
&& (!isset($flags['group'])
|
| 453 |
|| $flags['group'] == 'eu_options'
|
| 454 |
)
|
| 455 |
+
&& (!isset($flags['isExtraCover'])
|
| 456 |
+
|| $flags['isExtraCover'] == false
|
| 457 |
+
)
|
| 458 |
) {
|
| 459 |
if (!$asFlatArray) {
|
| 460 |
$options['4955'] = array(
|
app/code/community/TIG/PostNL/Model/Core/System/Config/Source/ProductOptions/Abstract.php
CHANGED
|
@@ -141,6 +141,10 @@ abstract class TIG_PostNL_Model_Core_System_Config_Source_ProductOptions_Abstrac
|
|
| 141 |
protected function _optionMatchesFlags($option, $flags)
|
| 142 |
{
|
| 143 |
foreach($flags as $key => $value) {
|
|
|
|
|
|
|
|
|
|
|
|
|
| 144 |
if (is_array($value)) {
|
| 145 |
foreach ($value as $valueOption) {
|
| 146 |
$result = $this->_optionMatchesFlags($option, array($key => $valueOption));
|
|
@@ -269,4 +273,4 @@ abstract class TIG_PostNL_Model_Core_System_Config_Source_ProductOptions_Abstrac
|
|
| 269 |
|
| 270 |
return $options;
|
| 271 |
}
|
| 272 |
-
}
|
| 141 |
protected function _optionMatchesFlags($option, $flags)
|
| 142 |
{
|
| 143 |
foreach($flags as $key => $value) {
|
| 144 |
+
if ($value === null) {
|
| 145 |
+
continue;
|
| 146 |
+
}
|
| 147 |
+
|
| 148 |
if (is_array($value)) {
|
| 149 |
foreach ($value as $valueOption) {
|
| 150 |
$result = $this->_optionMatchesFlags($option, array($key => $valueOption));
|
| 273 |
|
| 274 |
return $options;
|
| 275 |
}
|
| 276 |
+
}
|
app/code/community/TIG/PostNL/Model/Core/System/Config/Source/ShippingDurationDays.php
ADDED
|
@@ -0,0 +1,82 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* ___________ __ __
|
| 4 |
+
* \__ ___/____ _/ |_ _____ | |
|
| 5 |
+
* | | / _ \\ __\\__ \ | |
|
| 6 |
+
* | | | |_| || | / __ \_| |__
|
| 7 |
+
* |____| \____/ |__| (____ /|____/
|
| 8 |
+
* \/
|
| 9 |
+
* ___ __ __
|
| 10 |
+
* | | ____ _/ |_ ____ _______ ____ ____ _/ |_
|
| 11 |
+
* | | / \\ __\_/ __ \\_ __ \ / \ _/ __ \\ __\
|
| 12 |
+
* | || | \| | \ ___/ | | \/| | \\ ___/ | |
|
| 13 |
+
* |___||___| /|__| \_____>|__| |___| / \_____>|__|
|
| 14 |
+
* \/ \/
|
| 15 |
+
* ________
|
| 16 |
+
* / _____/_______ ____ __ __ ______
|
| 17 |
+
* / \ ___\_ __ \ / _ \ | | \\____ \
|
| 18 |
+
* \ \_\ \| | \/| |_| || | /| |_| |
|
| 19 |
+
* \______ /|__| \____/ |____/ | __/
|
| 20 |
+
* \/ |__|
|
| 21 |
+
*
|
| 22 |
+
* NOTICE OF LICENSE
|
| 23 |
+
*
|
| 24 |
+
* This source file is subject to the Creative Commons License.
|
| 25 |
+
* It is available through the world-wide-web at this URL:
|
| 26 |
+
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
|
| 27 |
+
* If you are unable to obtain it through the world-wide-web, please send an email
|
| 28 |
+
* to servicedesk@tig.nl so we can send you a copy immediately.
|
| 29 |
+
*
|
| 30 |
+
* DISCLAIMER
|
| 31 |
+
*
|
| 32 |
+
* Do not edit or add to this file if you wish to upgrade this module to newer
|
| 33 |
+
* versions in the future. If you wish to customize this module for your
|
| 34 |
+
* needs please contact servicedesk@tig.nl for more information.
|
| 35 |
+
*
|
| 36 |
+
* @copyright Copyright (c) 2015 Total Internet Group B.V. (http://www.tig.nl)
|
| 37 |
+
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
|
| 38 |
+
*/
|
| 39 |
+
class TIG_PostNL_Model_Core_System_Config_Source_ShippingDurationDays
|
| 40 |
+
{
|
| 41 |
+
/**
|
| 42 |
+
* Returns an option array for possible shipping duration days.
|
| 43 |
+
*
|
| 44 |
+
* @return array
|
| 45 |
+
*/
|
| 46 |
+
public function toOptionArray()
|
| 47 |
+
{
|
| 48 |
+
$helper = Mage::helper('postnl/deliveryOptions');
|
| 49 |
+
$labelSizes = array(
|
| 50 |
+
array(
|
| 51 |
+
'value' => '1',
|
| 52 |
+
'label' => $helper->__('Monday')
|
| 53 |
+
),
|
| 54 |
+
array(
|
| 55 |
+
'value' => '2',
|
| 56 |
+
'label' => $helper->__('Tuesday')
|
| 57 |
+
),
|
| 58 |
+
array(
|
| 59 |
+
'value' => '3',
|
| 60 |
+
'label' => $helper->__('Wednesday')
|
| 61 |
+
),
|
| 62 |
+
array(
|
| 63 |
+
'value' => '4',
|
| 64 |
+
'label' => $helper->__('Thursday')
|
| 65 |
+
),
|
| 66 |
+
array(
|
| 67 |
+
'value' => '5',
|
| 68 |
+
'label' => $helper->__('Friday')
|
| 69 |
+
),
|
| 70 |
+
array(
|
| 71 |
+
'value' => '6',
|
| 72 |
+
'label' => $helper->__('Saturday')
|
| 73 |
+
),
|
| 74 |
+
array(
|
| 75 |
+
'value' => '7',
|
| 76 |
+
'label' => $helper->__('Sunday'),
|
| 77 |
+
),
|
| 78 |
+
);
|
| 79 |
+
|
| 80 |
+
return $labelSizes;
|
| 81 |
+
}
|
| 82 |
+
}
|
app/code/community/TIG/PostNL/Model/Core/System/Config/Source/StandardProductOptions.php
CHANGED
|
@@ -283,7 +283,7 @@ class TIG_PostNL_Model_Core_System_Config_Source_StandardProductOptions
|
|
| 283 |
'isCod' => false,
|
| 284 |
);
|
| 285 |
|
| 286 |
-
if (
|
| 287 |
$country = Mage::helper('postnl')->getDomesticCountry();
|
| 288 |
}
|
| 289 |
|
|
@@ -334,7 +334,7 @@ class TIG_PostNL_Model_Core_System_Config_Source_StandardProductOptions
|
|
| 334 |
|
| 335 |
switch ($country) {
|
| 336 |
case 'NL':
|
| 337 |
-
$flags['isBelgiumOnly'] = false;
|
| 338 |
break;
|
| 339 |
case 'BE':
|
| 340 |
$flags['isBelgiumOnly'] = true;
|
|
@@ -353,7 +353,7 @@ class TIG_PostNL_Model_Core_System_Config_Source_StandardProductOptions
|
|
| 353 |
*/
|
| 354 |
public function getAvailableNlCodOptions($flat = false)
|
| 355 |
{
|
| 356 |
-
return $this->getOptions(array('isCod' => true, 'isBelgiumOnly' => false), $flat, true);
|
| 357 |
}
|
| 358 |
|
| 359 |
/**
|
| 283 |
'isCod' => false,
|
| 284 |
);
|
| 285 |
|
| 286 |
+
if (!$country) {
|
| 287 |
$country = Mage::helper('postnl')->getDomesticCountry();
|
| 288 |
}
|
| 289 |
|
| 334 |
|
| 335 |
switch ($country) {
|
| 336 |
case 'NL':
|
| 337 |
+
$flags['isBelgiumOnly'] = array(false, null);
|
| 338 |
break;
|
| 339 |
case 'BE':
|
| 340 |
$flags['isBelgiumOnly'] = true;
|
| 353 |
*/
|
| 354 |
public function getAvailableNlCodOptions($flat = false)
|
| 355 |
{
|
| 356 |
+
return $this->getOptions(array('isCod' => true, 'isBelgiumOnly' => array(null, false)), $flat, true);
|
| 357 |
}
|
| 358 |
|
| 359 |
/**
|
app/code/community/TIG/PostNL/Model/DeliveryOptions/Observer/UpdatePostnlOrder.php
CHANGED
|
@@ -144,7 +144,7 @@ class TIG_PostNL_Model_DeliveryOptions_Observer_UpdatePostnlOrder
|
|
| 144 |
* Calculate the correct fee based on the order type.
|
| 145 |
*/
|
| 146 |
if ($type == $postnlOrder::TYPE_PGE) {
|
| 147 |
-
$fee = Mage::helper('postnl/
|
| 148 |
->getExpressFee(false, $includingTax, false);
|
| 149 |
} elseif ($type == $postnlOrder::TYPE_AVOND) {
|
| 150 |
$fee = Mage::helper('postnl/deliveryOptions')
|
| 144 |
* Calculate the correct fee based on the order type.
|
| 145 |
*/
|
| 146 |
if ($type == $postnlOrder::TYPE_PGE) {
|
| 147 |
+
$fee = Mage::helper('postnl/deliveryOptions_fee')
|
| 148 |
->getExpressFee(false, $includingTax, false);
|
| 149 |
} elseif ($type == $postnlOrder::TYPE_AVOND) {
|
| 150 |
$fee = Mage::helper('postnl/deliveryOptions')
|
app/code/community/TIG/PostNL/Model/Payment/Cod.php
CHANGED
|
@@ -283,7 +283,7 @@ class TIG_PostNL_Model_Payment_Cod extends Mage_Payment_Model_Method_Abstract
|
|
| 283 |
* Check whether payment method is applicable to quote.
|
| 284 |
* Purposed to allow use in controllers some logic that was implemented in blocks only before.
|
| 285 |
*
|
| 286 |
-
* Overloaded to
|
| 287 |
*
|
| 288 |
* @param Mage_Sales_Model_Quote $quote
|
| 289 |
* @param int|null $checksBitMask
|
|
@@ -293,9 +293,6 @@ class TIG_PostNL_Model_Payment_Cod extends Mage_Payment_Model_Method_Abstract
|
|
| 293 |
public function isApplicableToQuote($quote, $checksBitMask)
|
| 294 |
{
|
| 295 |
if ($checksBitMask & self::CHECK_USE_FOR_COUNTRY) {
|
| 296 |
-
if (!$this->canUseForCountry($quote->getBillingAddress()->getCountry())) {
|
| 297 |
-
return false;
|
| 298 |
-
}
|
| 299 |
if (!$this->canUseForCountry($quote->getShippingAddress()->getCountry())) {
|
| 300 |
return false;
|
| 301 |
}
|
|
@@ -381,4 +378,4 @@ class TIG_PostNL_Model_Payment_Cod extends Mage_Payment_Model_Method_Abstract
|
|
| 381 |
$title = sprintf($title, $fee);
|
| 382 |
return $title;
|
| 383 |
}
|
| 384 |
-
}
|
| 283 |
* Check whether payment method is applicable to quote.
|
| 284 |
* Purposed to allow use in controllers some logic that was implemented in blocks only before.
|
| 285 |
*
|
| 286 |
+
* Overloaded to replace the CHECK_USE_FOR_COUNTRY check with the shipping address.
|
| 287 |
*
|
| 288 |
* @param Mage_Sales_Model_Quote $quote
|
| 289 |
* @param int|null $checksBitMask
|
| 293 |
public function isApplicableToQuote($quote, $checksBitMask)
|
| 294 |
{
|
| 295 |
if ($checksBitMask & self::CHECK_USE_FOR_COUNTRY) {
|
|
|
|
|
|
|
|
|
|
| 296 |
if (!$this->canUseForCountry($quote->getShippingAddress()->getCountry())) {
|
| 297 |
return false;
|
| 298 |
}
|
| 378 |
$title = sprintf($title, $fee);
|
| 379 |
return $title;
|
| 380 |
}
|
| 381 |
+
}
|
app/code/community/TIG/PostNL/Model/Resource/Setup.php
CHANGED
|
@@ -875,6 +875,7 @@ class TIG_PostNL_Model_Resource_Setup extends Mage_Eav_Model_Entity_Setup
|
|
| 875 |
*/
|
| 876 |
public function moveConfigSetting($fromXpath, $toXpath, $removeOldValue = true)
|
| 877 |
{
|
|
|
|
| 878 |
/**
|
| 879 |
* Get the current default value.
|
| 880 |
*/
|
|
@@ -938,6 +939,7 @@ class TIG_PostNL_Model_Resource_Setup extends Mage_Eav_Model_Entity_Setup
|
|
| 938 |
public function moveConfigSettingForScope($fromXpath, $toXpath, $scope = 'default', $scopeId = 0,
|
| 939 |
$removeOldValue = true, $defaultValue = false)
|
| 940 |
{
|
|
|
|
| 941 |
$config = Mage::getConfig();
|
| 942 |
|
| 943 |
if ($scope == 'store') {
|
| 875 |
*/
|
| 876 |
public function moveConfigSetting($fromXpath, $toXpath, $removeOldValue = true)
|
| 877 |
{
|
| 878 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_NOTICE);
|
| 879 |
/**
|
| 880 |
* Get the current default value.
|
| 881 |
*/
|
| 939 |
public function moveConfigSettingForScope($fromXpath, $toXpath, $scope = 'default', $scopeId = 0,
|
| 940 |
$removeOldValue = true, $defaultValue = false)
|
| 941 |
{
|
| 942 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_NOTICE);
|
| 943 |
$config = Mage::getConfig();
|
| 944 |
|
| 945 |
if ($scope == 'store') {
|
app/code/community/TIG/PostNL/controllers/DeliveryOptionsController.php
CHANGED
|
@@ -190,6 +190,7 @@ class TIG_PostNL_DeliveryOptionsController extends Mage_Core_Controller_Front_Ac
|
|
| 190 |
*/
|
| 191 |
public function saveOptionCostsAction()
|
| 192 |
{
|
|
|
|
| 193 |
/**
|
| 194 |
* This action may only be called using AJAX requests
|
| 195 |
*/
|
| 190 |
*/
|
| 191 |
public function saveOptionCostsAction()
|
| 192 |
{
|
| 193 |
+
trigger_error('This method is deprecated and may be removed in the future.', E_USER_NOTICE);
|
| 194 |
/**
|
| 195 |
* This action may only be called using AJAX requests
|
| 196 |
*/
|
app/code/community/TIG/PostNL/data/postnl_setup/data-install-1.7.2.php
ADDED
|
@@ -0,0 +1,159 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* ___________ __ __
|
| 4 |
+
* \__ ___/____ _/ |_ _____ | |
|
| 5 |
+
* | | / _ \\ __\\__ \ | |
|
| 6 |
+
* | | | |_| || | / __ \_| |__
|
| 7 |
+
* |____| \____/ |__| (____ /|____/
|
| 8 |
+
* \/
|
| 9 |
+
* ___ __ __
|
| 10 |
+
* | | ____ _/ |_ ____ _______ ____ ____ _/ |_
|
| 11 |
+
* | | / \\ __\_/ __ \\_ __ \ / \ _/ __ \\ __\
|
| 12 |
+
* | || | \| | \ ___/ | | \/| | \\ ___/ | |
|
| 13 |
+
* |___||___| /|__| \_____>|__| |___| / \_____>|__|
|
| 14 |
+
* \/ \/
|
| 15 |
+
* ________
|
| 16 |
+
* / _____/_______ ____ __ __ ______
|
| 17 |
+
* / \ ___\_ __ \ / _ \ | | \\____ \
|
| 18 |
+
* \ \_\ \| | \/| |_| || | /| |_| |
|
| 19 |
+
* \______ /|__| \____/ |____/ | __/
|
| 20 |
+
* \/ |__|
|
| 21 |
+
*
|
| 22 |
+
* NOTICE OF LICENSE
|
| 23 |
+
*
|
| 24 |
+
* This source file is subject to the Creative Commons License.
|
| 25 |
+
* It is available through the world-wide-web at this URL:
|
| 26 |
+
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
|
| 27 |
+
* If you are unable to obtain it through the world-wide-web, please send an email
|
| 28 |
+
* to servicedesk@tig.nl so we can send you a copy immediately.
|
| 29 |
+
*
|
| 30 |
+
* DISCLAIMER
|
| 31 |
+
*
|
| 32 |
+
* Do not edit or add to this file if you wish to upgrade this module to newer
|
| 33 |
+
* versions in the future. If you wish to customize this module for your
|
| 34 |
+
* needs please contact servicedesk@tig.nl for more information.
|
| 35 |
+
*
|
| 36 |
+
* @copyright Copyright (c) 2015 Total Internet Group B.V. (http://www.tig.nl)
|
| 37 |
+
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
|
| 38 |
+
*
|
| 39 |
+
* @var TIG_PostNL_Model_Resource_Setup $installer
|
| 40 |
+
*/
|
| 41 |
+
$installer = $this;
|
| 42 |
+
|
| 43 |
+
set_time_limit(0);
|
| 44 |
+
|
| 45 |
+
/**
|
| 46 |
+
* This attribute needs to be updated for simple products.
|
| 47 |
+
*/
|
| 48 |
+
$simpleAttributesData = array(
|
| 49 |
+
'postnl_max_qty_for_buspakje' => 0,
|
| 50 |
+
);
|
| 51 |
+
|
| 52 |
+
/**
|
| 53 |
+
* These attributes need to be updated for the product types specified below.
|
| 54 |
+
*/
|
| 55 |
+
$attributesData = array(
|
| 56 |
+
'postnl_allow_pakje_gemak' => 1,
|
| 57 |
+
'postnl_allow_delivery_days' => 1,
|
| 58 |
+
'postnl_allow_timeframes' => 1,
|
| 59 |
+
'postnl_allow_pakketautomaat' => 1,
|
| 60 |
+
'postnl_allow_delivery_options' => 1,
|
| 61 |
+
);
|
| 62 |
+
|
| 63 |
+
$productTypes = array(
|
| 64 |
+
Mage_Catalog_Model_Product_Type::TYPE_SIMPLE,
|
| 65 |
+
Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE,
|
| 66 |
+
Mage_Catalog_Model_Product_Type::TYPE_GROUPED,
|
| 67 |
+
Mage_Catalog_Model_Product_Type::TYPE_BUNDLE,
|
| 68 |
+
);
|
| 69 |
+
|
| 70 |
+
/**
|
| 71 |
+
* Matrix rate data.
|
| 72 |
+
*/
|
| 73 |
+
$matrixRateData = array(
|
| 74 |
+
array('NL', '*', '*', '0', '0', '0', 'regular', '5'), // Regular Dutch shipments
|
| 75 |
+
array('NL', '*', '*', '0', '0', '0', 'letter_box', '2.5'), // Dutch buspakje shipments
|
| 76 |
+
array('BE', '*', '*', '0', '0', '0', '*', '5'), // Belgian shipments
|
| 77 |
+
array('BE', '*', '*', '1', '0', '0', '*', '5'),
|
| 78 |
+
array('BE', '*', '*', '2', '0', '0', '*', '5'),
|
| 79 |
+
array('BE', '*', '*', '3', '0', '0', '*', '5'),
|
| 80 |
+
array('BE', '*', '*', '4', '0', '0', '*', '5'),
|
| 81 |
+
array('BE', '*', '*', '5', '0', '0', '*', '5'),
|
| 82 |
+
array('BE', '*', '*', '6', '0', '0', '*', '5'),
|
| 83 |
+
array('BE', '*', '*', '7', '0', '0', '*', '5'),
|
| 84 |
+
array('BE', '*', '*', '8', '0', '0', '*', '5'),
|
| 85 |
+
array('BE', '*', '*', '9', '0', '0', '*', '5'),
|
| 86 |
+
array('BE', '*', '*', '10', '0', '0', '*', '5'),
|
| 87 |
+
array('BE', '*', '*', '11', '0', '0', '*', '5'),
|
| 88 |
+
array('BE', '*', '*', '12', '0', '0', '*', '5'),
|
| 89 |
+
array('BE', '*', '*', '13', '0', '0', '*', '5'),
|
| 90 |
+
array('BE', '*', '*', '14', '0', '0', '*', '5'),
|
| 91 |
+
array('BE', '*', '*', '15', '0', '0', '*', '5'),
|
| 92 |
+
array('BE', '*', '*', '16', '0', '0', '*', '5'),
|
| 93 |
+
array('BE', '*', '*', '17', '0', '0', '*', '5'),
|
| 94 |
+
array('BE', '*', '*', '18', '0', '0', '*', '5'),
|
| 95 |
+
array('BE', '*', '*', '19', '0', '0', '*', '5'),
|
| 96 |
+
array('BE', '*', '*', '20', '0', '0', '*', '5'),
|
| 97 |
+
array('BE', '*', '*', '21', '0', '0', '*', '5'),
|
| 98 |
+
array('BE', '*', '*', '22', '0', '0', '*', '5'),
|
| 99 |
+
array('BE', '*', '*', '23', '0', '0', '*', '5'),
|
| 100 |
+
array('BE', '*', '*', '24', '0', '0', '*', '5'),
|
| 101 |
+
array('BE', '*', '*', '25', '0', '0', '*', '5'),
|
| 102 |
+
array('BE', '*', '*', '26', '0', '0', '*', '5'),
|
| 103 |
+
array('BE', '*', '*', '27', '0', '0', '*', '5'),
|
| 104 |
+
array('BE', '*', '*', '28', '0', '0', '*', '5'),
|
| 105 |
+
array('BE', '*', '*', '29', '0', '0', '*', '5'),
|
| 106 |
+
array('DE', '*', '*', '0', '0', '0', '*', '5'), // German shipments
|
| 107 |
+
array('DE', '*', '*', '1', '0', '0', '*', '5'),
|
| 108 |
+
array('DE', '*', '*', '2', '0', '0', '*', '5'),
|
| 109 |
+
array('DE', '*', '*', '3', '0', '0', '*', '5'),
|
| 110 |
+
array('DE', '*', '*', '4', '0', '0', '*', '5'),
|
| 111 |
+
array('DE', '*', '*', '5', '0', '0', '*', '5'),
|
| 112 |
+
array('DE', '*', '*', '6', '0', '0', '*', '5'),
|
| 113 |
+
array('DE', '*', '*', '7', '0', '0', '*', '5'),
|
| 114 |
+
array('DE', '*', '*', '8', '0', '0', '*', '5'),
|
| 115 |
+
array('DE', '*', '*', '9', '0', '0', '*', '5'),
|
| 116 |
+
array('DE', '*', '*', '10', '0', '0', '*', '5'),
|
| 117 |
+
array('DE', '*', '*', '11', '0', '0', '*', '5'),
|
| 118 |
+
array('DE', '*', '*', '12', '0', '0', '*', '5'),
|
| 119 |
+
array('DE', '*', '*', '13', '0', '0', '*', '5'),
|
| 120 |
+
array('DE', '*', '*', '14', '0', '0', '*', '5'),
|
| 121 |
+
array('DE', '*', '*', '15', '0', '0', '*', '5'),
|
| 122 |
+
array('DE', '*', '*', '16', '0', '0', '*', '5'),
|
| 123 |
+
array('DE', '*', '*', '17', '0', '0', '*', '5'),
|
| 124 |
+
array('DE', '*', '*', '18', '0', '0', '*', '5'),
|
| 125 |
+
array('DE', '*', '*', '19', '0', '0', '*', '5'),
|
| 126 |
+
array('DE', '*', '*', '20', '0', '0', '*', '5'),
|
| 127 |
+
array('DE', '*', '*', '21', '0', '0', '*', '5'),
|
| 128 |
+
array('DE', '*', '*', '22', '0', '0', '*', '5'),
|
| 129 |
+
array('DE', '*', '*', '23', '0', '0', '*', '5'),
|
| 130 |
+
array('DE', '*', '*', '24', '0', '0', '*', '5'),
|
| 131 |
+
array('DE', '*', '*', '25', '0', '0', '*', '5'),
|
| 132 |
+
array('DE', '*', '*', '26', '0', '0', '*', '5'),
|
| 133 |
+
array('DE', '*', '*', '27', '0', '0', '*', '5'),
|
| 134 |
+
array('DE', '*', '*', '28', '0', '0', '*', '5'),
|
| 135 |
+
array('DE', '*', '*', '29', '0', '0', '*', '5'),
|
| 136 |
+
array('*', '*', '*', '0', '0', '0', '*', '5'), // GlobalPack shipments
|
| 137 |
+
);
|
| 138 |
+
|
| 139 |
+
$installer->generateShippingStatusCronExpr()
|
| 140 |
+
->generateUpdateStatisticsCronExpr()
|
| 141 |
+
->generateReturnStatusCronExpr()
|
| 142 |
+
->expandSupportTab()
|
| 143 |
+
->installTestPassword()
|
| 144 |
+
->installWebshopId()
|
| 145 |
+
->installPackingSlipItemColumns()
|
| 146 |
+
->setProductAttributeUpdateCron(
|
| 147 |
+
array(
|
| 148 |
+
array(
|
| 149 |
+
$simpleAttributesData,
|
| 150 |
+
array(Mage_Catalog_Model_Product_Type::TYPE_SIMPLE),
|
| 151 |
+
),
|
| 152 |
+
array(
|
| 153 |
+
$attributesData,
|
| 154 |
+
$productTypes,
|
| 155 |
+
)
|
| 156 |
+
)
|
| 157 |
+
)
|
| 158 |
+
->installMatrixRates($matrixRateData)
|
| 159 |
+
->clearConfigCache();
|
app/code/community/TIG/PostNL/data/postnl_setup/data-upgrade-1.7.1-1.7.2.php
ADDED
|
@@ -0,0 +1,53 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* ___________ __ __
|
| 4 |
+
* \__ ___/____ _/ |_ _____ | |
|
| 5 |
+
* | | / _ \\ __\\__ \ | |
|
| 6 |
+
* | | | |_| || | / __ \_| |__
|
| 7 |
+
* |____| \____/ |__| (____ /|____/
|
| 8 |
+
* \/
|
| 9 |
+
* ___ __ __
|
| 10 |
+
* | | ____ _/ |_ ____ _______ ____ ____ _/ |_
|
| 11 |
+
* | | / \\ __\_/ __ \\_ __ \ / \ _/ __ \\ __\
|
| 12 |
+
* | || | \| | \ ___/ | | \/| | \\ ___/ | |
|
| 13 |
+
* |___||___| /|__| \_____>|__| |___| / \_____>|__|
|
| 14 |
+
* \/ \/
|
| 15 |
+
* ________
|
| 16 |
+
* / _____/_______ ____ __ __ ______
|
| 17 |
+
* / \ ___\_ __ \ / _ \ | | \\____ \
|
| 18 |
+
* \ \_\ \| | \/| |_| || | /| |_| |
|
| 19 |
+
* \______ /|__| \____/ |____/ | __/
|
| 20 |
+
* \/ |__|
|
| 21 |
+
*
|
| 22 |
+
* NOTICE OF LICENSE
|
| 23 |
+
*
|
| 24 |
+
* This source file is subject to the Creative Commons License.
|
| 25 |
+
* It is available through the world-wide-web at this URL:
|
| 26 |
+
* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
|
| 27 |
+
* If you are unable to obtain it through the world-wide-web, please send an email
|
| 28 |
+
* to servicedesk@tig.nl so we can send you a copy immediately.
|
| 29 |
+
*
|
| 30 |
+
* DISCLAIMER
|
| 31 |
+
*
|
| 32 |
+
* Do not edit or add to this file if you wish to upgrade this module to newer
|
| 33 |
+
* versions in the future. If you wish to customize this module for your
|
| 34 |
+
* needs please contact servicedesk@tig.nl for more information.
|
| 35 |
+
*
|
| 36 |
+
* @copyright Copyright (c) 2015 Total Internet Group B.V. (http://www.tig.nl)
|
| 37 |
+
* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
|
| 38 |
+
*/
|
| 39 |
+
|
| 40 |
+
/**
|
| 41 |
+
* @var TIG_PostNL_Model_Resource_Setup $installer
|
| 42 |
+
*/
|
| 43 |
+
$installer = $this;
|
| 44 |
+
|
| 45 |
+
/**
|
| 46 |
+
* These CIF webservices have been updated.
|
| 47 |
+
*/
|
| 48 |
+
$updatedWebservices = array(
|
| 49 |
+
'cif_version_confirming',
|
| 50 |
+
);
|
| 51 |
+
|
| 52 |
+
$installer->resetWebserviceVersions($updatedWebservices)
|
| 53 |
+
->clearConfigCache();
|
app/code/community/TIG/PostNL/etc/config.xml
CHANGED
|
@@ -41,7 +41,7 @@
|
|
| 41 |
<config>
|
| 42 |
<modules>
|
| 43 |
<TIG_PostNL>
|
| 44 |
-
<version>1.7.
|
| 45 |
</TIG_PostNL>
|
| 46 |
</modules>
|
| 47 |
|
|
@@ -447,16 +447,6 @@
|
|
| 447 |
</postnl_core_shipment_save>
|
| 448 |
</observers>
|
| 449 |
</controller_action_predispatch_adminhtml_sales_order_shipment_save>
|
| 450 |
-
<controller_action_postdispatch_postnl_admin>
|
| 451 |
-
<observers>
|
| 452 |
-
<!-- Admin logging -->
|
| 453 |
-
<postnl_enterprise_logging>
|
| 454 |
-
<type>model</type>
|
| 455 |
-
<class>postnl/admin_logging_observer</class>
|
| 456 |
-
<method>controllerPostdispatch</method>
|
| 457 |
-
</postnl_enterprise_logging>
|
| 458 |
-
</observers>
|
| 459 |
-
</controller_action_postdispatch_postnl_admin>
|
| 460 |
<admin_system_config_changed_section_postnl>
|
| 461 |
<observers>
|
| 462 |
<!-- Clean PostNL config cache -->
|
|
@@ -902,6 +892,7 @@
|
|
| 902 |
<mijnpakket_login_btn_test_base_url>tppcb-sandbox.e-id.nl/</mijnpakket_login_btn_test_base_url> <!-- Base URL for MijnPakket login button in test mode -->
|
| 903 |
<mijnpakket_login_btn_url_path>Button/PremiumLogin</mijnpakket_login_btn_url_path> <!-- Path to MijnPakket login button -->
|
| 904 |
<default_pakketautomaat_product_option>3553</default_pakketautomaat_product_option> <!-- Parcel dispenser -->
|
|
|
|
| 905 |
</delivery_options>
|
| 906 |
<cif>
|
| 907 |
<mode>0</mode> <!-- The extension is disabled by default -->
|
|
@@ -1070,6 +1061,7 @@
|
|
| 1070 |
<default_sunday_product_option>3385</default_sunday_product_option> <!-- Deliver to stated address only -->
|
| 1071 |
<default_eu_product_option>4952</default_eu_product_option> <!-- EU Pack Special to consumer (combilabel) -->
|
| 1072 |
<default_eu_be_product_option>4955</default_eu_be_product_option> <!-- EU Pack Standard (Belgium only, no signature) (combilabel) -->
|
|
|
|
| 1073 |
</grid>
|
| 1074 |
<cif_product_options>
|
| 1075 |
<allow_eps_be_only_options>0</allow_eps_be_only_options> <!-- Do not allow the EPS BE only product option -->
|
|
@@ -1135,7 +1127,7 @@
|
|
| 1135 |
|
| 1136 |
<!-- Stability of this release -->
|
| 1137 |
<stability>
|
| 1138 |
-
<postnl>
|
| 1139 |
</stability>
|
| 1140 |
|
| 1141 |
<!-- PostNL delivery options configuration -->
|
| 41 |
<config>
|
| 42 |
<modules>
|
| 43 |
<TIG_PostNL>
|
| 44 |
+
<version>1.7.2</version>
|
| 45 |
</TIG_PostNL>
|
| 46 |
</modules>
|
| 47 |
|
| 447 |
</postnl_core_shipment_save>
|
| 448 |
</observers>
|
| 449 |
</controller_action_predispatch_adminhtml_sales_order_shipment_save>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 450 |
<admin_system_config_changed_section_postnl>
|
| 451 |
<observers>
|
| 452 |
<!-- Clean PostNL config cache -->
|
| 892 |
<mijnpakket_login_btn_test_base_url>tppcb-sandbox.e-id.nl/</mijnpakket_login_btn_test_base_url> <!-- Base URL for MijnPakket login button in test mode -->
|
| 893 |
<mijnpakket_login_btn_url_path>Button/PremiumLogin</mijnpakket_login_btn_url_path> <!-- Path to MijnPakket login button -->
|
| 894 |
<default_pakketautomaat_product_option>3553</default_pakketautomaat_product_option> <!-- Parcel dispenser -->
|
| 895 |
+
<ajax_timeout>5</ajax_timeout> <!-- Delivery options AJAX calls will timeout after 5 seconds -->
|
| 896 |
</delivery_options>
|
| 897 |
<cif>
|
| 898 |
<mode>0</mode> <!-- The extension is disabled by default -->
|
| 1061 |
<default_sunday_product_option>3385</default_sunday_product_option> <!-- Deliver to stated address only -->
|
| 1062 |
<default_eu_product_option>4952</default_eu_product_option> <!-- EU Pack Special to consumer (combilabel) -->
|
| 1063 |
<default_eu_be_product_option>4955</default_eu_be_product_option> <!-- EU Pack Standard (Belgium only, no signature) (combilabel) -->
|
| 1064 |
+
<valid_shipping_duration_days>1,2,3,4,5,6,7</valid_shipping_duration_days> <!-- all days of the week -->
|
| 1065 |
</grid>
|
| 1066 |
<cif_product_options>
|
| 1067 |
<allow_eps_be_only_options>0</allow_eps_be_only_options> <!-- Do not allow the EPS BE only product option -->
|
| 1127 |
|
| 1128 |
<!-- Stability of this release -->
|
| 1129 |
<stability>
|
| 1130 |
+
<postnl>develop</postnl>
|
| 1131 |
</stability>
|
| 1132 |
|
| 1133 |
<!-- PostNL delivery options configuration -->
|
app/code/community/TIG/PostNL/etc/jstranslator.xml
CHANGED
|
@@ -57,6 +57,9 @@
|
|
| 57 |
<sunday translate="message" module="postnl">
|
| 58 |
<message>sunday</message>
|
| 59 |
</sunday>
|
|
|
|
|
|
|
|
|
|
| 60 |
<post_office translate="message" module="postnl">
|
| 61 |
<message>Post Office</message>
|
| 62 |
</post_office>
|
| 57 |
<sunday translate="message" module="postnl">
|
| 58 |
<message>sunday</message>
|
| 59 |
</sunday>
|
| 60 |
+
<monday translate="message" module="postnl">
|
| 61 |
+
<message>monday</message>
|
| 62 |
+
</monday>
|
| 63 |
<post_office translate="message" module="postnl">
|
| 64 |
<message>Post Office</message>
|
| 65 |
</post_office>
|
app/code/community/TIG/PostNL/etc/logging.xml
CHANGED
|
@@ -42,28 +42,28 @@
|
|
| 42 |
<postnl_shipment translate="label" module="postnl">
|
| 43 |
<label>PostNL</label>
|
| 44 |
<actions>
|
| 45 |
-
<
|
| 46 |
<action>Print label</action>
|
| 47 |
<expected_models>
|
| 48 |
<postnl_core__shipment/>
|
| 49 |
</expected_models>
|
| 50 |
-
</
|
| 51 |
|
| 52 |
-
<
|
| 53 |
<action>Print return label</action>
|
| 54 |
<expected_models>
|
| 55 |
<postnl_core__shipment/>
|
| 56 |
</expected_models>
|
| 57 |
-
</
|
| 58 |
|
| 59 |
-
<
|
| 60 |
<action>Print packing slip</action>
|
| 61 |
<expected_models>
|
| 62 |
<postnl_core__shipment/>
|
| 63 |
</expected_models>
|
| 64 |
-
</
|
| 65 |
|
| 66 |
-
<
|
| 67 |
<action>Confirm shipment</action>
|
| 68 |
<expected_models>
|
| 69 |
<postnl_core__shipment/>
|
|
@@ -71,16 +71,16 @@
|
|
| 71 |
<skip_on_back>
|
| 72 |
<adminhtml_sales_shipment_view/>
|
| 73 |
</skip_on_back>
|
| 74 |
-
</
|
| 75 |
|
| 76 |
-
<
|
| 77 |
<action>View status history</action>
|
| 78 |
<expected_models>
|
| 79 |
<postnl_core__shipment/>
|
| 80 |
</expected_models>
|
| 81 |
-
</
|
| 82 |
|
| 83 |
-
<
|
| 84 |
<action>Send track & trace email</action>
|
| 85 |
<expected_models>
|
| 86 |
<postnl_core__shipment/>
|
|
@@ -88,9 +88,9 @@
|
|
| 88 |
<skip_on_back>
|
| 89 |
<adminhtml_sales_shipment_view/>
|
| 90 |
</skip_on_back>
|
| 91 |
-
</
|
| 92 |
|
| 93 |
-
<
|
| 94 |
<action>Send return label email</action>
|
| 95 |
<expected_models>
|
| 96 |
<postnl_core__shipment/>
|
|
@@ -98,16 +98,16 @@
|
|
| 98 |
<skip_on_back>
|
| 99 |
<adminhtml_sales_shipment_view/>
|
| 100 |
</skip_on_back>
|
| 101 |
-
</
|
| 102 |
|
| 103 |
-
<
|
| 104 |
<action>Change confirmation</action>
|
| 105 |
<expected_models>
|
| 106 |
<postnl_core__shipment/>
|
| 107 |
</expected_models>
|
| 108 |
-
</
|
| 109 |
|
| 110 |
-
<
|
| 111 |
<action>Delete labels</action>
|
| 112 |
<expected_models>
|
| 113 |
<postnl_core__shipment/>
|
|
@@ -115,9 +115,9 @@
|
|
| 115 |
<skip_on_back>
|
| 116 |
<adminhtml_sales_shipment_view/>
|
| 117 |
</skip_on_back>
|
| 118 |
-
</
|
| 119 |
|
| 120 |
-
<
|
| 121 |
<action>Convert to letter box</action>
|
| 122 |
<expected_models>
|
| 123 |
<postnl_core__shipment/>
|
|
@@ -125,9 +125,9 @@
|
|
| 125 |
<skip_on_back>
|
| 126 |
<adminhtml_sales_shipment_view/>
|
| 127 |
</skip_on_back>
|
| 128 |
-
</
|
| 129 |
|
| 130 |
-
<
|
| 131 |
<action>Convert to package</action>
|
| 132 |
<expected_models>
|
| 133 |
<postnl_core__shipment/>
|
|
@@ -135,9 +135,9 @@
|
|
| 135 |
<skip_on_back>
|
| 136 |
<adminhtml_sales_shipment_view/>
|
| 137 |
</skip_on_back>
|
| 138 |
-
</
|
| 139 |
|
| 140 |
-
<
|
| 141 |
<action>Change product code</action>
|
| 142 |
<expected_models>
|
| 143 |
<postnl_core__shipment/>
|
|
@@ -145,9 +145,9 @@
|
|
| 145 |
<skip_on_back>
|
| 146 |
<adminhtml_sales_shipment_view/>
|
| 147 |
</skip_on_back>
|
| 148 |
-
</
|
| 149 |
|
| 150 |
-
<
|
| 151 |
<action>Change parcel count</action>
|
| 152 |
<expected_models>
|
| 153 |
<postnl_core__shipment/>
|
|
@@ -155,93 +155,93 @@
|
|
| 155 |
<skip_on_back>
|
| 156 |
<adminhtml_sales_shipment_view/>
|
| 157 |
</skip_on_back>
|
| 158 |
-
</
|
| 159 |
|
| 160 |
-
<
|
| 161 |
<action>Create shipments</action>
|
| 162 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 163 |
-
</
|
| 164 |
|
| 165 |
-
<
|
| 166 |
<action>Create shipments, print labels and confirm shipment</action>
|
| 167 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 168 |
-
</
|
| 169 |
|
| 170 |
-
<
|
| 171 |
<action>Create shipments, print packing slips and confirm shipment</action>
|
| 172 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 173 |
-
</
|
| 174 |
|
| 175 |
-
<
|
| 176 |
<action>Print labels and confirm shipment</action>
|
| 177 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 178 |
-
</
|
| 179 |
|
| 180 |
-
<
|
| 181 |
<action>Print packing slips and confirm shipment</action>
|
| 182 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 183 |
-
</
|
| 184 |
|
| 185 |
-
<
|
| 186 |
<action>Print labels</action>
|
| 187 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 188 |
-
</
|
| 189 |
|
| 190 |
-
<
|
| 191 |
<action>Print packing slips</action>
|
| 192 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 193 |
-
</
|
| 194 |
|
| 195 |
-
<
|
| 196 |
<action>Confirm shipments</action>
|
| 197 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 198 |
-
</
|
| 199 |
|
| 200 |
-
<
|
| 201 |
<action>Create Parcelware export</action>
|
| 202 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 203 |
-
</
|
| 204 |
|
| 205 |
-
<
|
| 206 |
<action>Update shipping statusses</action>
|
| 207 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 208 |
-
</
|
| 209 |
|
| 210 |
-
<
|
| 211 |
<action>Validate account settings</action>
|
| 212 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchAction</post_dispatch>
|
| 213 |
-
</
|
| 214 |
|
| 215 |
-
<
|
| 216 |
<action>Export table rates</action>
|
| 217 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchAction</post_dispatch>
|
| 218 |
-
</
|
| 219 |
|
| 220 |
-
<
|
| 221 |
<action>Export matrix rates</action>
|
| 222 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchAction</post_dispatch>
|
| 223 |
-
</
|
| 224 |
|
| 225 |
-
<
|
| 226 |
<action>Download logs</action>
|
| 227 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchAction</post_dispatch>
|
| 228 |
-
</
|
| 229 |
|
| 230 |
-
<
|
| 231 |
<action>Activate</action>
|
| 232 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchAction</post_dispatch>
|
| 233 |
<skip_on_back>
|
| 234 |
<adminhtml_system_config_edit/>
|
| 235 |
</skip_on_back>
|
| 236 |
-
</
|
| 237 |
|
| 238 |
-
<
|
| 239 |
<action>Reset activation</action>
|
| 240 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchAction</post_dispatch>
|
| 241 |
<skip_on_back>
|
| 242 |
<adminhtml_system_config_edit/>
|
| 243 |
</skip_on_back>
|
| 244 |
-
</
|
| 245 |
</actions>
|
| 246 |
</postnl_shipment>
|
| 247 |
</logging>
|
| 42 |
<postnl_shipment translate="label" module="postnl">
|
| 43 |
<label>PostNL</label>
|
| 44 |
<actions>
|
| 45 |
+
<adminhtml_postnlAdminhtml_shipment_printLabel translate="action" module="postnl">
|
| 46 |
<action>Print label</action>
|
| 47 |
<expected_models>
|
| 48 |
<postnl_core__shipment/>
|
| 49 |
</expected_models>
|
| 50 |
+
</adminhtml_postnlAdminhtml_shipment_printLabel>
|
| 51 |
|
| 52 |
+
<adminhtml_postnlAdminhtml_shipment_printReturnLabel translate="action" module="postnl">
|
| 53 |
<action>Print return label</action>
|
| 54 |
<expected_models>
|
| 55 |
<postnl_core__shipment/>
|
| 56 |
</expected_models>
|
| 57 |
+
</adminhtml_postnlAdminhtml_shipment_printReturnLabel>
|
| 58 |
|
| 59 |
+
<adminhtml_postnlAdminhtml_shipment_printPackingSlip translate="action" module="postnl">
|
| 60 |
<action>Print packing slip</action>
|
| 61 |
<expected_models>
|
| 62 |
<postnl_core__shipment/>
|
| 63 |
</expected_models>
|
| 64 |
+
</adminhtml_postnlAdminhtml_shipment_printPackingSlip>
|
| 65 |
|
| 66 |
+
<adminhtml_postnlAdminhtml_shipment_confirm translate="action" module="postnl">
|
| 67 |
<action>Confirm shipment</action>
|
| 68 |
<expected_models>
|
| 69 |
<postnl_core__shipment/>
|
| 71 |
<skip_on_back>
|
| 72 |
<adminhtml_sales_shipment_view/>
|
| 73 |
</skip_on_back>
|
| 74 |
+
</adminhtml_postnlAdminhtml_shipment_confirm>
|
| 75 |
|
| 76 |
+
<adminhtml_postnlAdminhtml_statusHistory translate="action" module="postnl">
|
| 77 |
<action>View status history</action>
|
| 78 |
<expected_models>
|
| 79 |
<postnl_core__shipment/>
|
| 80 |
</expected_models>
|
| 81 |
+
</adminhtml_postnlAdminhtml_statusHistory>
|
| 82 |
|
| 83 |
+
<adminhtml_postnlAdminhtml_shipment_sendTrackAndTrace translate="action" module="postnl">
|
| 84 |
<action>Send track & trace email</action>
|
| 85 |
<expected_models>
|
| 86 |
<postnl_core__shipment/>
|
| 88 |
<skip_on_back>
|
| 89 |
<adminhtml_sales_shipment_view/>
|
| 90 |
</skip_on_back>
|
| 91 |
+
</adminhtml_postnlAdminhtml_shipment_sendTrackAndTrace>
|
| 92 |
|
| 93 |
+
<adminhtml_postnlAdminhtml_shipment_sendReturnLabelEmail translate="action" module="postnl">
|
| 94 |
<action>Send return label email</action>
|
| 95 |
<expected_models>
|
| 96 |
<postnl_core__shipment/>
|
| 98 |
<skip_on_back>
|
| 99 |
<adminhtml_sales_shipment_view/>
|
| 100 |
</skip_on_back>
|
| 101 |
+
</adminhtml_postnlAdminhtml_shipment_sendReturnLabelEmail>
|
| 102 |
|
| 103 |
+
<adminhtml_postnlAdminhtml_shipment_resetConfirmation translate="action" module="postnl">
|
| 104 |
<action>Change confirmation</action>
|
| 105 |
<expected_models>
|
| 106 |
<postnl_core__shipment/>
|
| 107 |
</expected_models>
|
| 108 |
+
</adminhtml_postnlAdminhtml_shipment_resetConfirmation>
|
| 109 |
|
| 110 |
+
<adminhtml_postnlAdminhtml_shipment_removeLabels translate="action" module="postnl">
|
| 111 |
<action>Delete labels</action>
|
| 112 |
<expected_models>
|
| 113 |
<postnl_core__shipment/>
|
| 115 |
<skip_on_back>
|
| 116 |
<adminhtml_sales_shipment_view/>
|
| 117 |
</skip_on_back>
|
| 118 |
+
</adminhtml_postnlAdminhtml_shipment_removeLabels>
|
| 119 |
|
| 120 |
+
<adminhtml_postnlAdminhtml_shipment_convertToBuspakje translate="action" module="postnl">
|
| 121 |
<action>Convert to letter box</action>
|
| 122 |
<expected_models>
|
| 123 |
<postnl_core__shipment/>
|
| 125 |
<skip_on_back>
|
| 126 |
<adminhtml_sales_shipment_view/>
|
| 127 |
</skip_on_back>
|
| 128 |
+
</adminhtml_postnlAdminhtml_shipment_convertToBuspakje>
|
| 129 |
|
| 130 |
+
<adminhtml_postnlAdminhtml_shipment_convertToPackage translate="action" module="postnl">
|
| 131 |
<action>Convert to package</action>
|
| 132 |
<expected_models>
|
| 133 |
<postnl_core__shipment/>
|
| 135 |
<skip_on_back>
|
| 136 |
<adminhtml_sales_shipment_view/>
|
| 137 |
</skip_on_back>
|
| 138 |
+
</adminhtml_postnlAdminhtml_shipment_convertToPackage>
|
| 139 |
|
| 140 |
+
<adminhtml_postnlAdminhtml_shipment_changeProductCode translate="action" module="postnl">
|
| 141 |
<action>Change product code</action>
|
| 142 |
<expected_models>
|
| 143 |
<postnl_core__shipment/>
|
| 145 |
<skip_on_back>
|
| 146 |
<adminhtml_sales_shipment_view/>
|
| 147 |
</skip_on_back>
|
| 148 |
+
</adminhtml_postnlAdminhtml_shipment_changeProductCode>
|
| 149 |
|
| 150 |
+
<adminhtml_postnlAdminhtml_shipment_changeParcelCount translate="action" module="postnl">
|
| 151 |
<action>Change parcel count</action>
|
| 152 |
<expected_models>
|
| 153 |
<postnl_core__shipment/>
|
| 155 |
<skip_on_back>
|
| 156 |
<adminhtml_sales_shipment_view/>
|
| 157 |
</skip_on_back>
|
| 158 |
+
</adminhtml_postnlAdminhtml_shipment_changeParcelCount>
|
| 159 |
|
| 160 |
+
<adminhtml_postnlAdminhtml_shipment_massCreateShipments translate="action" module="postnl">
|
| 161 |
<action>Create shipments</action>
|
| 162 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 163 |
+
</adminhtml_postnlAdminhtml_shipment_massCreateShipments>
|
| 164 |
|
| 165 |
+
<adminhtml_postnlAdminhtml_shipment_massFullPostnlFlow translate="action" module="postnl">
|
| 166 |
<action>Create shipments, print labels and confirm shipment</action>
|
| 167 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 168 |
+
</adminhtml_postnlAdminhtml_shipment_massFullPostnlFlow>
|
| 169 |
|
| 170 |
+
<adminhtml_postnlAdminhtml_shipment_massFullPostnlFlowWithPackingSlip translate="action" module="postnl">
|
| 171 |
<action>Create shipments, print packing slips and confirm shipment</action>
|
| 172 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 173 |
+
</adminhtml_postnlAdminhtml_shipment_massFullPostnlFlowWithPackingSlip>
|
| 174 |
|
| 175 |
+
<adminhtml_postnlAdminhtml_shipment_massPrintLabelsAndConfirm translate="action" module="postnl">
|
| 176 |
<action>Print labels and confirm shipment</action>
|
| 177 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 178 |
+
</adminhtml_postnlAdminhtml_shipment_massPrintLabelsAndConfirm>
|
| 179 |
|
| 180 |
+
<adminhtml_postnlAdminhtml_shipment_massPrintPackingSlipsAndConfirm translate="action" module="postnl">
|
| 181 |
<action>Print packing slips and confirm shipment</action>
|
| 182 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 183 |
+
</adminhtml_postnlAdminhtml_shipment_massPrintPackingSlipsAndConfirm>
|
| 184 |
|
| 185 |
+
<adminhtml_postnlAdminhtml_shipment_massPrintLabels translate="action" module="postnl">
|
| 186 |
<action>Print labels</action>
|
| 187 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 188 |
+
</adminhtml_postnlAdminhtml_shipment_massPrintLabels>
|
| 189 |
|
| 190 |
+
<adminhtml_postnlAdminhtml_shipment_massPrintPackingslips translate="action" module="postnl">
|
| 191 |
<action>Print packing slips</action>
|
| 192 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 193 |
+
</adminhtml_postnlAdminhtml_shipment_massPrintPackingslips>
|
| 194 |
|
| 195 |
+
<adminhtml_postnlAdminhtml_shipment_massConfirm translate="action" module="postnl">
|
| 196 |
<action>Confirm shipments</action>
|
| 197 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 198 |
+
</adminhtml_postnlAdminhtml_shipment_massConfirm>
|
| 199 |
|
| 200 |
+
<adminhtml_postnlAdminhtml_shipment_massCreateParcelwareExport translate="action" module="postnl">
|
| 201 |
<action>Create Parcelware export</action>
|
| 202 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 203 |
+
</adminhtml_postnlAdminhtml_shipment_massCreateParcelwareExport>
|
| 204 |
|
| 205 |
+
<adminhtml_postnlAdminhtml_shipment_massUpdateShippingStatus translate="action" module="postnl">
|
| 206 |
<action>Update shipping statusses</action>
|
| 207 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchSaveMassAction</post_dispatch>
|
| 208 |
+
</adminhtml_postnlAdminhtml_shipment_massUpdateShippingStatus>
|
| 209 |
|
| 210 |
+
<adminhtml_postnlAdminhtml_config_validateAccount translate="action" module="postnl">
|
| 211 |
<action>Validate account settings</action>
|
| 212 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchAction</post_dispatch>
|
| 213 |
+
</adminhtml_postnlAdminhtml_config_validateAccount>
|
| 214 |
|
| 215 |
+
<adminhtml_postnlAdminhtml_config_exportTablerates translate="action" module="postnl">
|
| 216 |
<action>Export table rates</action>
|
| 217 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchAction</post_dispatch>
|
| 218 |
+
</adminhtml_postnlAdminhtml_config_exportTablerates>
|
| 219 |
|
| 220 |
+
<adminhtml_postnlAdminhtml_config_exportMatrixrates translate="action" module="postnl">
|
| 221 |
<action>Export matrix rates</action>
|
| 222 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchAction</post_dispatch>
|
| 223 |
+
</adminhtml_postnlAdminhtml_config_exportMatrixrates>
|
| 224 |
|
| 225 |
+
<adminhtml_postnlAdminhtml_config_downloadLogs translate="action" module="postnl">
|
| 226 |
<action>Download logs</action>
|
| 227 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchAction</post_dispatch>
|
| 228 |
+
</adminhtml_postnlAdminhtml_config_downloadLogs>
|
| 229 |
|
| 230 |
+
<adminhtml_postnlAdminhtml_extensionControl_activate translate="action" module="postnl">
|
| 231 |
<action>Activate</action>
|
| 232 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchAction</post_dispatch>
|
| 233 |
<skip_on_back>
|
| 234 |
<adminhtml_system_config_edit/>
|
| 235 |
</skip_on_back>
|
| 236 |
+
</adminhtml_postnlAdminhtml_extensionControl_activate>
|
| 237 |
|
| 238 |
+
<adminhtml_postnlAdminhtml_extensionControl_showActivationFields translate="action" module="postnl">
|
| 239 |
<action>Reset activation</action>
|
| 240 |
<post_dispatch>postnl__admin_logging_handler_postnl::postDispatchAction</post_dispatch>
|
| 241 |
<skip_on_back>
|
| 242 |
<adminhtml_system_config_edit/>
|
| 243 |
</skip_on_back>
|
| 244 |
+
</adminhtml_postnlAdminhtml_extensionControl_showActivationFields>
|
| 245 |
</actions>
|
| 246 |
</postnl_shipment>
|
| 247 |
</logging>
|
app/code/community/TIG/PostNL/etc/system.xml
CHANGED
|
@@ -2023,7 +2023,7 @@
|
|
| 2023 |
<allow_sunday_sorting translate="label comment tooltip" module="postnl">
|
| 2024 |
<label>Enable monday delivery</label>
|
| 2025 |
<comment><![CDATA[You can read more about monday delivery <a href="http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/maandagbezorging/" target="_blank" title="monday delivery">here</a>.]]></comment>
|
| 2026 |
-
<tooltip>Activate monday delivery (also known as sunday sorting) for your customers.</tooltip>
|
| 2027 |
<frontend_type>checkbox</frontend_type>
|
| 2028 |
<backend_model>postnl/system_config_backend_checkbox</backend_model>
|
| 2029 |
<source_model>postnl/system_config_source_yesno</source_model>
|
|
@@ -4550,6 +4550,14 @@
|
|
| 4550 |
<show_in_website>0</show_in_website>
|
| 4551 |
<show_in_store>0</show_in_store>
|
| 4552 |
<depends>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 4553 |
<country>
|
| 4554 |
<fieldset>cif_address</fieldset>
|
| 4555 |
<value>NL</value>
|
|
@@ -4630,6 +4638,17 @@
|
|
| 4630 |
</country>
|
| 4631 |
</depends>
|
| 4632 |
</default_stated_address_only_product_option>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 4633 |
</fields>
|
| 4634 |
</grid>
|
| 4635 |
<advanced translate="label comment" module="postnl">
|
|
@@ -4720,8 +4739,8 @@
|
|
| 4720 |
<source_model>postnl/system_config_source_yesno</source_model>
|
| 4721 |
<sort_order>80</sort_order>
|
| 4722 |
<show_in_default>1</show_in_default>
|
| 4723 |
-
<show_in_website>
|
| 4724 |
-
<show_in_store>
|
| 4725 |
</show_error_details_in_frontend>
|
| 4726 |
<postnl_shipping_methods translate="label tooltip" module="postnl">
|
| 4727 |
<label>PostNL shipping methods</label>
|
| 2023 |
<allow_sunday_sorting translate="label comment tooltip" module="postnl">
|
| 2024 |
<label>Enable monday delivery</label>
|
| 2025 |
<comment><![CDATA[You can read more about monday delivery <a href="http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/maandagbezorging/" target="_blank" title="monday delivery">here</a>.]]></comment>
|
| 2026 |
+
<tooltip>Activate monday delivery (also known as sunday sorting) for your customers. Note: this only applies to home deliveries. Postal office deliveries will not take place on Monday.</tooltip>
|
| 2027 |
<frontend_type>checkbox</frontend_type>
|
| 2028 |
<backend_model>postnl/system_config_backend_checkbox</backend_model>
|
| 2029 |
<source_model>postnl/system_config_source_yesno</source_model>
|
| 4550 |
<show_in_website>0</show_in_website>
|
| 4551 |
<show_in_store>0</show_in_store>
|
| 4552 |
<depends>
|
| 4553 |
+
<delivery_options_active>
|
| 4554 |
+
<fieldset>delivery_options</fieldset>
|
| 4555 |
+
<value>1</value>
|
| 4556 |
+
</delivery_options_active>
|
| 4557 |
+
<enable_pakjegemak>
|
| 4558 |
+
<fieldset>delivery_options</fieldset>
|
| 4559 |
+
<value>1</value>
|
| 4560 |
+
</enable_pakjegemak>
|
| 4561 |
<country>
|
| 4562 |
<fieldset>cif_address</fieldset>
|
| 4563 |
<value>NL</value>
|
| 4638 |
</country>
|
| 4639 |
</depends>
|
| 4640 |
</default_stated_address_only_product_option>
|
| 4641 |
+
<!-- Temporarily removed as it is not fully stable yet. -->
|
| 4642 |
+
<!--<valid_shipping_duration_days translate="label comment" module="postnl">-->
|
| 4643 |
+
<!--<label>Valid shipping duration days</label>-->
|
| 4644 |
+
<!--<comment>Select which days of the week count towards the shipping duration setting.</comment>-->
|
| 4645 |
+
<!--<source_model>postnl_core/system_config_source_shippingDurationDays</source_model>-->
|
| 4646 |
+
<!--<frontend_type>multiselect</frontend_type>-->
|
| 4647 |
+
<!--<sort_order>210</sort_order>-->
|
| 4648 |
+
<!--<show_in_default>1</show_in_default>-->
|
| 4649 |
+
<!--<show_in_website>0</show_in_website>-->
|
| 4650 |
+
<!--<show_in_store>0</show_in_store>-->
|
| 4651 |
+
<!--</valid_shipping_duration_days>-->
|
| 4652 |
</fields>
|
| 4653 |
</grid>
|
| 4654 |
<advanced translate="label comment" module="postnl">
|
| 4739 |
<source_model>postnl/system_config_source_yesno</source_model>
|
| 4740 |
<sort_order>80</sort_order>
|
| 4741 |
<show_in_default>1</show_in_default>
|
| 4742 |
+
<show_in_website>0</show_in_website>
|
| 4743 |
+
<show_in_store>0</show_in_store>
|
| 4744 |
</show_error_details_in_frontend>
|
| 4745 |
<postnl_shipping_methods translate="label tooltip" module="postnl">
|
| 4746 |
<label>PostNL shipping methods</label>
|
app/design/adminhtml/default/default/template/TIG/PostNL/sales/order/shipment/create/shipment_options.phtml
CHANGED
|
@@ -52,10 +52,22 @@
|
|
| 52 |
<?php $_isDomesticShipment = (bool) $_cifHelper->isDomesticShipment($_shipment); ?>
|
| 53 |
<?php $_isCod = (bool) $_cifHelper->isCodShipment($_shipment);?>
|
| 54 |
<?php $_isPakjeGemak = (bool) $_cifHelper->isPakjeGemakShipment($_shipment);?>
|
|
|
|
| 55 |
<?php $_isAvond = (bool) $_cifHelper->isAvondShipment($_shipment); ?>
|
|
|
|
|
|
|
| 56 |
<?php $_parcelCount = $this->getParcelCount(); ?>
|
| 57 |
<div id="postnl_product_options">
|
| 58 |
-
<?php if(Mage::helper('postnl')->canUseBuspakje()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 59 |
<?php $_fitsAsBuspakje = $this->getFitsAsBuspakje(); ?>
|
| 60 |
<?php $_buspakjeCalcMode = $this->getBuspakjeCalcMode(); ?>
|
| 61 |
<div id="postnl_is_buspakje_container" <?php if ($_buspakjeCalcMode == 'automatic'): ?>style="display:none;"<?php endif; ?>>
|
| 52 |
<?php $_isDomesticShipment = (bool) $_cifHelper->isDomesticShipment($_shipment); ?>
|
| 53 |
<?php $_isCod = (bool) $_cifHelper->isCodShipment($_shipment);?>
|
| 54 |
<?php $_isPakjeGemak = (bool) $_cifHelper->isPakjeGemakShipment($_shipment);?>
|
| 55 |
+
<?php $_isPakketautomaat = (bool) $_cifHelper->isPakketautomaatShipment($_shipment);?>
|
| 56 |
<?php $_isAvond = (bool) $_cifHelper->isAvondShipment($_shipment); ?>
|
| 57 |
+
<?php $_isSunday = (bool) $_cifHelper->isSundayShipment($_shipment); ?>
|
| 58 |
+
<?php $_isMonday = (bool) $_cifHelper->isMondayShipment($_shipment); ?>
|
| 59 |
<?php $_parcelCount = $this->getParcelCount(); ?>
|
| 60 |
<div id="postnl_product_options">
|
| 61 |
+
<?php if (Mage::helper('postnl')->canUseBuspakje()
|
| 62 |
+
&& $_isDomesticShipment
|
| 63 |
+
&& !$_isCod
|
| 64 |
+
&& !$_isPakjeGemak
|
| 65 |
+
&& !$_isAvond
|
| 66 |
+
&& !$_isPakketautomaat
|
| 67 |
+
&& !$_isBelgium
|
| 68 |
+
&& !$_isSunday
|
| 69 |
+
&& !$_isMonday
|
| 70 |
+
) : ?>
|
| 71 |
<?php $_fitsAsBuspakje = $this->getFitsAsBuspakje(); ?>
|
| 72 |
<?php $_buspakjeCalcMode = $this->getBuspakjeCalcMode(); ?>
|
| 73 |
<div id="postnl_is_buspakje_container" <?php if ($_buspakjeCalcMode == 'automatic'): ?>style="display:none;"<?php endif; ?>>
|
app/design/adminhtml/default/default/template/TIG/PostNL/sales/order/shipment/view/delivery_options.phtml
CHANGED
|
@@ -57,6 +57,7 @@
|
|
| 57 |
<?php $_isDomesticShipment = (bool) $_cifHelper->isDomesticShipment($_shipment); ?>
|
| 58 |
<?php $_isCod = (bool) $_cifHelper->isCodShipment($_shipment);?>
|
| 59 |
<?php $_isPakjeGemak = (bool) $_cifHelper->isPakjeGemakShipment($_shipment);?>
|
|
|
|
| 60 |
<?php endif; ?>
|
| 61 |
<?php if ($_postnlShipment->getId() && $_postnlShipment->getShipmentType()): ?>
|
| 62 |
<div class="hor-scroll" id="postnl_delivery_option_info">
|
|
@@ -74,10 +75,12 @@
|
|
| 74 |
<?php endif; ?>
|
| 75 |
</td>
|
| 76 |
</tr>
|
| 77 |
-
|
| 78 |
-
<
|
| 79 |
-
|
| 80 |
-
|
|
|
|
|
|
|
| 81 |
<?php if ($_deliveryTimeInfo): ?>
|
| 82 |
<tr>
|
| 83 |
<td class="label"><label><?php echo $this->__('Expected delivery time'); ?></label></td>
|
|
@@ -171,7 +174,7 @@
|
|
| 171 |
<?php continue; ?>
|
| 172 |
<?php endif; ?>
|
| 173 |
|
| 174 |
-
<?php if (isset($_option['isExtraCover']) && $_option['isExtraCover'] === true): ?>
|
| 175 |
<?php continue;?>
|
| 176 |
<?php endif; ?>
|
| 177 |
|
|
@@ -273,4 +276,4 @@
|
|
| 273 |
<?php endif; ?>
|
| 274 |
//]]>
|
| 275 |
</script>
|
| 276 |
-
<?php endif; ?>
|
| 57 |
<?php $_isDomesticShipment = (bool) $_cifHelper->isDomesticShipment($_shipment); ?>
|
| 58 |
<?php $_isCod = (bool) $_cifHelper->isCodShipment($_shipment);?>
|
| 59 |
<?php $_isPakjeGemak = (bool) $_cifHelper->isPakjeGemakShipment($_shipment);?>
|
| 60 |
+
<?php $_hasExtraCoverAmount = (bool) $_postnlShipment->getExtraCoverAmount(); ?>
|
| 61 |
<?php endif; ?>
|
| 62 |
<?php if ($_postnlShipment->getId() && $_postnlShipment->getShipmentType()): ?>
|
| 63 |
<div class="hor-scroll" id="postnl_delivery_option_info">
|
| 75 |
<?php endif; ?>
|
| 76 |
</td>
|
| 77 |
</tr>
|
| 78 |
+
<?php if (isset($_isDomesticShipment) && $_isDomesticShipment): ?>
|
| 79 |
+
<tr>
|
| 80 |
+
<td class="label"><label><?php echo $this->__('Expected delivery date'); ?></label></td>
|
| 81 |
+
<td class="value"><strong><?php echo $this->formatDate($_postnlShipment->getDeliveryDate(), Mage_Core_Model_Locale::FORMAT_TYPE_FULL) ?></strong></td>
|
| 82 |
+
</tr>
|
| 83 |
+
<?php endif; ?>
|
| 84 |
<?php if ($_deliveryTimeInfo): ?>
|
| 85 |
<tr>
|
| 86 |
<td class="label"><label><?php echo $this->__('Expected delivery time'); ?></label></td>
|
| 174 |
<?php continue; ?>
|
| 175 |
<?php endif; ?>
|
| 176 |
|
| 177 |
+
<?php if (isset($_option['isExtraCover']) && $_option['isExtraCover'] === true && !$_hasExtraCoverAmount): ?>
|
| 178 |
<?php continue;?>
|
| 179 |
<?php endif; ?>
|
| 180 |
|
| 276 |
<?php endif; ?>
|
| 277 |
//]]>
|
| 278 |
</script>
|
| 279 |
+
<?php endif; ?>
|
app/design/adminhtml/default/default/template/TIG/PostNL/sales/order/view/delivery_options.phtml
CHANGED
|
@@ -60,10 +60,12 @@
|
|
| 60 |
<?php endif; ?>
|
| 61 |
</td>
|
| 62 |
</tr>
|
| 63 |
-
|
| 64 |
-
<
|
| 65 |
-
|
| 66 |
-
|
|
|
|
|
|
|
| 67 |
<?php if ($_deliveryTimeInfo): ?>
|
| 68 |
<tr>
|
| 69 |
<td class="label"><label><?php echo $this->__('Requested delivery time'); ?></label></td>
|
|
@@ -107,4 +109,4 @@
|
|
| 107 |
}
|
| 108 |
//]]>
|
| 109 |
</script>
|
| 110 |
-
<?php endif; ?>
|
| 60 |
<?php endif; ?>
|
| 61 |
</td>
|
| 62 |
</tr>
|
| 63 |
+
<?php if ($_postnlOrder->getOrder()->getShippingAddress()->getCountryId() == $_helper->getDomesticCountry()): ?>
|
| 64 |
+
<tr>
|
| 65 |
+
<td class="label"><label><?php echo $this->__('Requested delivery date'); ?></label></td>
|
| 66 |
+
<td class="value"><strong><?php echo $this->formatDate($_postnlOrder->getDeliveryDate(), Mage_Core_Model_Locale::FORMAT_TYPE_FULL) ?></strong></td>
|
| 67 |
+
</tr>
|
| 68 |
+
<?php endif; ?>
|
| 69 |
<?php if ($_deliveryTimeInfo): ?>
|
| 70 |
<tr>
|
| 71 |
<td class="label"><label><?php echo $this->__('Requested delivery time'); ?></label></td>
|
| 109 |
}
|
| 110 |
//]]>
|
| 111 |
</script>
|
| 112 |
+
<?php endif; ?>
|
app/design/frontend/base/default/template/TIG/PostNL/address_validation/onestepcheckout/postcode_check.phtml
CHANGED
|
@@ -54,16 +54,25 @@
|
|
| 54 |
<?php $_timeoutDelay = $_postnlHelper->getPostcodeCheckTimeoutDelay(); ?>
|
| 55 |
<?php $_maxAttempts = $_postnlHelper->getPostcodeCheckMaxAttempts(); ?>
|
| 56 |
|
| 57 |
-
|
| 58 |
-
<
|
| 59 |
-
<
|
| 60 |
-
<?php echo $
|
| 61 |
-
|
| 62 |
-
|
| 63 |
-
|
| 64 |
-
|
| 65 |
-
|
| 66 |
-
</
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 67 |
<li class="clearfix" id="osc_postnl">
|
| 68 |
<div class="input-box input-postcode">
|
| 69 |
<label for="<?php echo $_addressType; ?>:postcode">
|
| 54 |
<?php $_timeoutDelay = $_postnlHelper->getPostcodeCheckTimeoutDelay(); ?>
|
| 55 |
<?php $_maxAttempts = $_postnlHelper->getPostcodeCheckMaxAttempts(); ?>
|
| 56 |
|
| 57 |
+
<?php if(!Mage::getStoreConfig('onestepcheckout/exclude_fields/exclude_country_id')) : ?>
|
| 58 |
+
<li class="clearfix">
|
| 59 |
+
<div class="input-box input-country">
|
| 60 |
+
<label for="<?php echo $_addressType; ?>:country_id">
|
| 61 |
+
<?php echo $_postnlHelper->__('Country') ?>
|
| 62 |
+
<span class="required">*</span>
|
| 63 |
+
</label>
|
| 64 |
+
<br />
|
| 65 |
+
<?php echo $this->getCountryHtmlSelect() ?>
|
| 66 |
+
</div>
|
| 67 |
+
</li>
|
| 68 |
+
<?php else: ?>
|
| 69 |
+
<?php $defaultCountry = Mage::getStoreConfig('onestepcheckout/general/default_country')?>
|
| 70 |
+
<li class="clearfix">
|
| 71 |
+
<div class="input-box input-country">
|
| 72 |
+
<input type="hidden" name="billing[use_for_shipping]" id="<?php echo $_addressType; ?>:country_id" class="validate-select country_hidden" value="<?php echo $defaultCountry; ?>" title="Country" />
|
| 73 |
+
</div>
|
| 74 |
+
</li>
|
| 75 |
+
<?php endif;?>
|
| 76 |
<li class="clearfix" id="osc_postnl">
|
| 77 |
<div class="input-box input-postcode">
|
| 78 |
<label for="<?php echo $_addressType; ?>:postcode">
|
app/design/frontend/base/default/template/TIG/PostNL/delivery_options/gomage_checkout/available.phtml
CHANGED
|
@@ -64,6 +64,7 @@
|
|
| 64 |
<?php endif; ?>
|
| 65 |
<?php foreach ($_shippingRateGroups as $code => $_rates): ?>
|
| 66 |
<?php $_isPostnl = false; ?>
|
|
|
|
| 67 |
<?php if (!$_deliveryOptionsShown
|
| 68 |
&& $_canUseDeliveryOptions
|
| 69 |
&& $_carrierHelper->isPostnlShippingMethod($_rate->getCode())): ?>
|
| 64 |
<?php endif; ?>
|
| 65 |
<?php foreach ($_shippingRateGroups as $code => $_rates): ?>
|
| 66 |
<?php $_isPostnl = false; ?>
|
| 67 |
+
<?php $_rate = current($_rates); ?>
|
| 68 |
<?php if (!$_deliveryOptionsShown
|
| 69 |
&& $_canUseDeliveryOptions
|
| 70 |
&& $_carrierHelper->isPostnlShippingMethod($_rate->getCode())): ?>
|
app/design/frontend/base/default/template/TIG/PostNL/delivery_options/gomage_checkout/deliveryoptions.phtml
CHANGED
|
@@ -84,6 +84,8 @@
|
|
| 84 |
<?php $_methodRate = $this->getMethodRate(); ?>
|
| 85 |
|
| 86 |
<?php $_pakjeGemakRate = $_methodRate + $this->getFee('pakje_gemak', $this->helper('tax')->shippingPriceIncludesTax()); ?>
|
|
|
|
|
|
|
| 87 |
<div id="osc_initial_loader"><?php echo $this->__('Loading...'); ?></div>
|
| 88 |
<div id="postnl_add_moment" style="display:none;">
|
| 89 |
<ul class="option-list">
|
|
@@ -358,7 +360,9 @@
|
|
| 358 |
}
|
| 359 |
},
|
| 360 |
<?php endif; ?>
|
| 361 |
-
optionsContainer : 'osc_scrollbar_container'
|
|
|
|
|
|
|
| 362 |
};
|
| 363 |
|
| 364 |
try {
|
|
@@ -968,4 +972,4 @@
|
|
| 968 |
modifyCheckoutJs();
|
| 969 |
}
|
| 970 |
//]]>
|
| 971 |
-
</script>
|
| 84 |
<?php $_methodRate = $this->getMethodRate(); ?>
|
| 85 |
|
| 86 |
<?php $_pakjeGemakRate = $_methodRate + $this->getFee('pakje_gemak', $this->helper('tax')->shippingPriceIncludesTax()); ?>
|
| 87 |
+
|
| 88 |
+
<?php $_deliveryOptionsAjaxTimeout = $this->getDeliveryOptionsAjaxTimeout(); ?>
|
| 89 |
<div id="osc_initial_loader"><?php echo $this->__('Loading...'); ?></div>
|
| 90 |
<div id="postnl_add_moment" style="display:none;">
|
| 91 |
<ul class="option-list">
|
| 360 |
}
|
| 361 |
},
|
| 362 |
<?php endif; ?>
|
| 363 |
+
optionsContainer : 'osc_scrollbar_container',
|
| 364 |
+
getLocationsTimeout : <?php echo $_deliveryOptionsAjaxTimeout; ?>,
|
| 365 |
+
getTimeframesTimeout : <?php echo $_deliveryOptionsAjaxTimeout; ?>
|
| 366 |
};
|
| 367 |
|
| 368 |
try {
|
| 972 |
modifyCheckoutJs();
|
| 973 |
}
|
| 974 |
//]]>
|
| 975 |
+
</script>
|
app/design/frontend/base/default/template/TIG/PostNL/delivery_options/onepage/deliveryoptions.phtml
CHANGED
|
@@ -81,6 +81,8 @@
|
|
| 81 |
<?php $_methodRate = $this->getMethodRate(); ?>
|
| 82 |
|
| 83 |
<?php $_pakjeGemakRate = $_methodRate + $this->getFee('pakje_gemak', $this->helper('tax')->shippingPriceIncludesTax()); ?>
|
|
|
|
|
|
|
| 84 |
<div id="initial_loader" class="postnl-loader"><?php echo $this->__('Loading...'); ?></div>
|
| 85 |
<div id="postnl_delivery_options" style="display:none;">
|
| 86 |
<div class="title">
|
|
@@ -230,7 +232,9 @@
|
|
| 230 |
}
|
| 231 |
},
|
| 232 |
<?php endif; ?>
|
| 233 |
-
currencySymbol : '<?php echo Mage::app()->getLocale()->currency($_store->getCurrentCurrencyCode())->getSymbol(); ?>'
|
|
|
|
|
|
|
| 234 |
};
|
| 235 |
|
| 236 |
try {
|
| 81 |
<?php $_methodRate = $this->getMethodRate(); ?>
|
| 82 |
|
| 83 |
<?php $_pakjeGemakRate = $_methodRate + $this->getFee('pakje_gemak', $this->helper('tax')->shippingPriceIncludesTax()); ?>
|
| 84 |
+
|
| 85 |
+
<?php $_deliveryOptionsAjaxTimeout = $this->getDeliveryOptionsAjaxTimeout(); ?>
|
| 86 |
<div id="initial_loader" class="postnl-loader"><?php echo $this->__('Loading...'); ?></div>
|
| 87 |
<div id="postnl_delivery_options" style="display:none;">
|
| 88 |
<div class="title">
|
| 232 |
}
|
| 233 |
},
|
| 234 |
<?php endif; ?>
|
| 235 |
+
currencySymbol : '<?php echo Mage::app()->getLocale()->currency($_store->getCurrentCurrencyCode())->getSymbol(); ?>',
|
| 236 |
+
getLocationsTimeout : <?php echo $_deliveryOptionsAjaxTimeout; ?>,
|
| 237 |
+
getTimeframesTimeout : <?php echo $_deliveryOptionsAjaxTimeout; ?>
|
| 238 |
};
|
| 239 |
|
| 240 |
try {
|
app/design/frontend/base/default/template/TIG/PostNL/delivery_options/onestepcheckout/deliveryoptions.phtml
CHANGED
|
@@ -71,6 +71,8 @@
|
|
| 71 |
|
| 72 |
<?php $_canShowStatedAddressOnlyOption = Mage::helper('postnl/deliveryOptions')->canShowOnlyStatedAddressOption(); ?>
|
| 73 |
|
|
|
|
|
|
|
| 74 |
<?php $_eveningFeeIncl = $this->getFee('evening', true); ?>
|
| 75 |
<?php $_eveningFeeExcl = $this->getFee('evening', false); ?>
|
| 76 |
<?php $_sundayFeeIncl = $this->getFee('sunday', true); ?>
|
|
@@ -366,7 +368,9 @@
|
|
| 366 |
}
|
| 367 |
},
|
| 368 |
<?php endif; ?>
|
| 369 |
-
optionsContainer : 'osc_scrollbar_container'
|
|
|
|
|
|
|
| 370 |
};
|
| 371 |
|
| 372 |
try {
|
|
@@ -381,7 +385,7 @@
|
|
| 381 |
deliveryOptions.showOptions();
|
| 382 |
$('carrier_postnl').addClassName('options-available');
|
| 383 |
|
| 384 |
-
<?php if($_canShowSeparateRates): ?>
|
| 385 |
/**
|
| 386 |
* Hide the default price label as this will be replaced by separate prices for delivery and pick up options.
|
| 387 |
*/
|
| 71 |
|
| 72 |
<?php $_canShowStatedAddressOnlyOption = Mage::helper('postnl/deliveryOptions')->canShowOnlyStatedAddressOption(); ?>
|
| 73 |
|
| 74 |
+
<?php $_deliveryOptionsAjaxTimeout = $this->getDeliveryOptionsAjaxTimeout(); ?>
|
| 75 |
+
|
| 76 |
<?php $_eveningFeeIncl = $this->getFee('evening', true); ?>
|
| 77 |
<?php $_eveningFeeExcl = $this->getFee('evening', false); ?>
|
| 78 |
<?php $_sundayFeeIncl = $this->getFee('sunday', true); ?>
|
| 368 |
}
|
| 369 |
},
|
| 370 |
<?php endif; ?>
|
| 371 |
+
optionsContainer : 'osc_scrollbar_container',
|
| 372 |
+
getLocationsTimeout : <?php echo $_deliveryOptionsAjaxTimeout; ?>,
|
| 373 |
+
getTimeframesTimeout : <?php echo $_deliveryOptionsAjaxTimeout; ?>
|
| 374 |
};
|
| 375 |
|
| 376 |
try {
|
| 385 |
deliveryOptions.showOptions();
|
| 386 |
$('carrier_postnl').addClassName('options-available');
|
| 387 |
|
| 388 |
+
<?php if ($_canShowSeparateRates): ?>
|
| 389 |
/**
|
| 390 |
* Hide the default price label as this will be replaced by separate prices for delivery and pick up options.
|
| 391 |
*/
|
app/design/frontend/base/default/template/TIG/PostNL/payment/checkout/form/cod.phtml
CHANGED
|
@@ -122,6 +122,11 @@
|
|
| 122 |
|
| 123 |
togglePostnlCod = function() {
|
| 124 |
var postnlCodPaymentMethod = $('p_method_<?php echo $_methodCode; ?>');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 125 |
var postnlCodPaymentMethodContainer = $('container_payment_method_<?php echo $_methodCode; ?>');
|
| 126 |
|
| 127 |
if (
|
| 122 |
|
| 123 |
togglePostnlCod = function() {
|
| 124 |
var postnlCodPaymentMethod = $('p_method_<?php echo $_methodCode; ?>');
|
| 125 |
+
|
| 126 |
+
if (typeof postnlCodPaymentMethod == 'undefined') {
|
| 127 |
+
return;
|
| 128 |
+
}
|
| 129 |
+
|
| 130 |
var postnlCodPaymentMethodContainer = $('container_payment_method_<?php echo $_methodCode; ?>');
|
| 131 |
|
| 132 |
if (
|
app/locale/en_US/TIG_PostNL.csv
CHANGED
|
@@ -92,7 +92,7 @@ TIG_PostNL::Use only the primary sender address,Use only the primary sender addr
|
|
| 92 |
TIG_PostNL::Product Options,Product Options
|
| 93 |
TIG_PostNL::Select selectable option,Select selectable option
|
| 94 |
TIG_PostNL::Default shipping option,Default shipping option
|
| 95 |
-
TIG_PostNL::This setting may be overwritten by
|
| 96 |
TIG_PostNL::Use an alternative default option,Use an alternative default option
|
| 97 |
TIG_PostNL::Enable this to use an alternative default option when a shipment's total value exceeds a certain amount.,Enable this to use an alternative default option when a shipment's total value exceeds a certain amount.
|
| 98 |
TIG_PostNL::Maximum amount,Maximum amount
|
|
@@ -659,7 +659,7 @@ TIG_PostNL::Invalid response for GetNearestLocations request: %s,Invalid respons
|
|
| 659 |
TIG_PostNL::Invalid arguments supplied. GetDeliveryTimeframes requires a postcode and a housenumber.,Invalid arguments supplied. GetDeliveryTimeframes requires a postcode and a housenumber.
|
| 660 |
TIG_PostNL::Invalid postcode supplied for GetDeliveryTimeframes request: %s Postcodes may only contain 4 numbers and 2 letters.,Invalid postcode supplied for GetDeliveryTimeframes request: %s Postcodes may only contain 4 numbers and 2 letters.
|
| 661 |
TIG_PostNL::Invalid housenumber supplied for GetDeliveryTimeframes request: %s Housenumbers may only contain digits.,Invalid housenumber supplied for GetDeliveryTimeframes request: %s Housenumbers may only contain digits.
|
| 662 |
-
TIG_PostNL::Invalid shipping duration: %s. Shipping duration must be between
|
| 663 |
TIG_PostNL::Invalid arguments supplied. getNearestLocationsInArea requires two sets of coordinates.,Invalid arguments supplied. getNearestLocationsInArea requires two sets of coordinates.
|
| 664 |
"TIG_PostNL::Invalid NE coordinates supplied for getLocationsInArea request. lat: %s, long: %s","Invalid NE coordinates supplied for getLocationsInArea request. lat: %s, long: %s"
|
| 665 |
"TIG_PostNL::Invalid SW coordinates supplied for getLocationsInArea request. lat: %s, long: %s","Invalid SW coordinates supplied for getLocationsInArea request. lat: %s, long: %s"
|
|
@@ -724,7 +724,7 @@ TIG_PostNL::Delete Shipping Labels,Delete Shipping Labels
|
|
| 724 |
TIG_PostNL::The current user is not allowed to perform this action.,The current user is not allowed to perform this action.
|
| 725 |
Actions,Actions
|
| 726 |
TIG_PostNL::Default evening delivery shipping option,Default evening delivery shipping option
|
| 727 |
-
TIG_PostNL::This setting may be overwritten by
|
| 728 |
TIG_PostNL::Default early post office pickup option,Default early post office pickup option
|
| 729 |
TIG_PostNL::This setting can be overwritten by manually creating shipments. This option is only applicable to early pickup Post Office shipments.,This setting can be overwritten by manually creating shipments. This option is only applicable to early pickup Post Office shipments.
|
| 730 |
TIG_PostNL::Default shipment type,Default shipment type
|
|
@@ -954,9 +954,9 @@ TIG_PostNL::Letter box qty,Letter box qty
|
|
| 954 |
TIG_PostNL::No Confirmation Required,No Confirmation Required
|
| 955 |
TIG_PostNL::The following options are only for COD orders.,The following options are only for COD orders.
|
| 956 |
TIG_PostNL::Default COD shipping option,Default COD shipping option
|
| 957 |
-
TIG_PostNL::This setting may be overwritten by
|
| 958 |
TIG_PostNL::Default evening COD delivery shipping option,Default evening COD delivery shipping option
|
| 959 |
-
TIG_PostNL::This setting may be overwritten by
|
| 960 |
TIG_PostNL::Default 'deliver at the Post Office' COD option,Default 'deliver at the Post Office' COD option
|
| 961 |
TIG_PostNL::This setting can be overwritten by manually creating shipments. This option is only applicable to Post Office COD shipments.,This setting can be overwritten by manually creating shipments. This option is only applicable to Post Office COD shipments.
|
| 962 |
TIG_PostNL::Default early post office pickup COD option,Default early post office pickup COD option
|
|
@@ -1287,7 +1287,7 @@ TIG_PostNL::Loading available delivery options for your shipping address...,Load
|
|
| 1287 |
TIG_PostNL::Picqer's PostNL add-on version,Picqer's PostNL add-on version
|
| 1288 |
TIG_PostNL::Default sunday delivery shipping option,Default sunday delivery shipping option
|
| 1289 |
TIG_PostNL::Enable sunday delivery,Enable sunday delivery
|
| 1290 |
-
TIG_PostNL::This setting may be overwritten by
|
| 1291 |
TIG_PostNL::Activate sunday delivery for your customers.,Activate sunday delivery for your customers.
|
| 1292 |
TIG_PostNL::Sunday Delivery,Sunday Delivery
|
| 1293 |
TIG_PostNL::Sunday,Sunday
|
|
@@ -1303,7 +1303,7 @@ TIG_PostNL::Belgium COD + Return when not home,Belgium COD + Return when not hom
|
|
| 1303 |
TIG_PostNL::Belgium Extra cover (EUR 500)+ Return when not home + Deliver to stated address only,Belgium Extra cover (EUR 500)+ Return when not home + Deliver to stated address only
|
| 1304 |
TIG_PostNL::Belgium COD + Extra cover (EUR 500) + Return when not home,Belgium COD + Extra cover (EUR 500) + Return when not home
|
| 1305 |
TIG_PostNL::Default Belgium shipping option,Default Belgium shipping option
|
| 1306 |
-
TIG_PostNL::This setting may be overwritten by
|
| 1307 |
TIG_PostNL::Default Belgium COD shipping option,Default Belgium COD shipping option
|
| 1308 |
TIG_PostNL::PostNL delivery options are only available when shipping from the Netherlands.,PostNL delivery options are only available when shipping from the Netherlands.
|
| 1309 |
TIG_PostNL::Delivery options are only available when shipping from the Netherlands.,Delivery options are only available when shipping from the Netherlands.
|
|
@@ -1314,5 +1314,17 @@ TIG_PostNL::Activate monday delivery (also known as sunday sorting) for your cus
|
|
| 1314 |
"TIG_PostNL::You can read more about monday delivery <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/maandagbezorging/"" target=""_blank"" title=""monday delivery"">here</a>.","You can read more about monday delivery <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/maandagbezorging/"" target=""_blank"" title=""monday delivery"">here</a>."
|
| 1315 |
"TIG_PostNL::You can read more about sunday delivery <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/zondagbezorging/"" target=""_blank"" title=""sunday delivery"">here</a>.","You can read more about sunday delivery <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/zondagbezorging/"" target=""_blank"" title=""sunday delivery"">here</a>."
|
| 1316 |
TIG_PostNL::sunday,sunday
|
| 1317 |
-
TIG_PostNL::
|
| 1318 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 92 |
TIG_PostNL::Product Options,Product Options
|
| 93 |
TIG_PostNL::Select selectable option,Select selectable option
|
| 94 |
TIG_PostNL::Default shipping option,Default shipping option
|
| 95 |
+
TIG_PostNL::This setting may be overwritten by manually creating shipments. This option is only applicable to domestic shipments.,This setting may be overwritten by manually creating shipments. This option is only applicable to domestic shipments.
|
| 96 |
TIG_PostNL::Use an alternative default option,Use an alternative default option
|
| 97 |
TIG_PostNL::Enable this to use an alternative default option when a shipment's total value exceeds a certain amount.,Enable this to use an alternative default option when a shipment's total value exceeds a certain amount.
|
| 98 |
TIG_PostNL::Maximum amount,Maximum amount
|
| 659 |
TIG_PostNL::Invalid arguments supplied. GetDeliveryTimeframes requires a postcode and a housenumber.,Invalid arguments supplied. GetDeliveryTimeframes requires a postcode and a housenumber.
|
| 660 |
TIG_PostNL::Invalid postcode supplied for GetDeliveryTimeframes request: %s Postcodes may only contain 4 numbers and 2 letters.,Invalid postcode supplied for GetDeliveryTimeframes request: %s Postcodes may only contain 4 numbers and 2 letters.
|
| 661 |
TIG_PostNL::Invalid housenumber supplied for GetDeliveryTimeframes request: %s Housenumbers may only contain digits.,Invalid housenumber supplied for GetDeliveryTimeframes request: %s Housenumbers may only contain digits.
|
| 662 |
+
TIG_PostNL::Invalid shipping duration: %s. Shipping duration must be between 0 and 14 days.,Invalid shipping duration: %s. Shipping duration must be between 0 and 14 days.
|
| 663 |
TIG_PostNL::Invalid arguments supplied. getNearestLocationsInArea requires two sets of coordinates.,Invalid arguments supplied. getNearestLocationsInArea requires two sets of coordinates.
|
| 664 |
"TIG_PostNL::Invalid NE coordinates supplied for getLocationsInArea request. lat: %s, long: %s","Invalid NE coordinates supplied for getLocationsInArea request. lat: %s, long: %s"
|
| 665 |
"TIG_PostNL::Invalid SW coordinates supplied for getLocationsInArea request. lat: %s, long: %s","Invalid SW coordinates supplied for getLocationsInArea request. lat: %s, long: %s"
|
| 724 |
TIG_PostNL::The current user is not allowed to perform this action.,The current user is not allowed to perform this action.
|
| 725 |
Actions,Actions
|
| 726 |
TIG_PostNL::Default evening delivery shipping option,Default evening delivery shipping option
|
| 727 |
+
TIG_PostNL::This setting may be overwritten by manually creating shipments. This option is only applicable to domestic evening delivery shipments.,This setting may be overwritten by manually creating shipments. This option is only applicable to domestic evening delivery shipments.
|
| 728 |
TIG_PostNL::Default early post office pickup option,Default early post office pickup option
|
| 729 |
TIG_PostNL::This setting can be overwritten by manually creating shipments. This option is only applicable to early pickup Post Office shipments.,This setting can be overwritten by manually creating shipments. This option is only applicable to early pickup Post Office shipments.
|
| 730 |
TIG_PostNL::Default shipment type,Default shipment type
|
| 954 |
TIG_PostNL::No Confirmation Required,No Confirmation Required
|
| 955 |
TIG_PostNL::The following options are only for COD orders.,The following options are only for COD orders.
|
| 956 |
TIG_PostNL::Default COD shipping option,Default COD shipping option
|
| 957 |
+
TIG_PostNL::This setting may be overwritten by manually creating shipments. This option is only applicable to domestic COD shipments.,This setting may be overwritten by manually creating shipments. This option is only applicable to domestic COD shipments.
|
| 958 |
TIG_PostNL::Default evening COD delivery shipping option,Default evening COD delivery shipping option
|
| 959 |
+
TIG_PostNL::This setting may be overwritten by manually creating shipments. This option is only applicable to domestic evening delivery shipments.,This setting may be overwritten by manually creating shipments. This option is only applicable to domestic evening delivery shipments.
|
| 960 |
TIG_PostNL::Default 'deliver at the Post Office' COD option,Default 'deliver at the Post Office' COD option
|
| 961 |
TIG_PostNL::This setting can be overwritten by manually creating shipments. This option is only applicable to Post Office COD shipments.,This setting can be overwritten by manually creating shipments. This option is only applicable to Post Office COD shipments.
|
| 962 |
TIG_PostNL::Default early post office pickup COD option,Default early post office pickup COD option
|
| 1287 |
TIG_PostNL::Picqer's PostNL add-on version,Picqer's PostNL add-on version
|
| 1288 |
TIG_PostNL::Default sunday delivery shipping option,Default sunday delivery shipping option
|
| 1289 |
TIG_PostNL::Enable sunday delivery,Enable sunday delivery
|
| 1290 |
+
TIG_PostNL::This setting may be overwritten by manually creating shipments.,This setting may be overwritten by manually creating shipments.
|
| 1291 |
TIG_PostNL::Activate sunday delivery for your customers.,Activate sunday delivery for your customers.
|
| 1292 |
TIG_PostNL::Sunday Delivery,Sunday Delivery
|
| 1293 |
TIG_PostNL::Sunday,Sunday
|
| 1303 |
TIG_PostNL::Belgium Extra cover (EUR 500)+ Return when not home + Deliver to stated address only,Belgium Extra cover (EUR 500)+ Return when not home + Deliver to stated address only
|
| 1304 |
TIG_PostNL::Belgium COD + Extra cover (EUR 500) + Return when not home,Belgium COD + Extra cover (EUR 500) + Return when not home
|
| 1305 |
TIG_PostNL::Default Belgium shipping option,Default Belgium shipping option
|
| 1306 |
+
TIG_PostNL::This setting may be overwritten by manually creating shipments. This option is only applicable to Belgian domestic shipments.,This setting may be overwritten by manually creating shipments. This option is only applicable to Belgian domestic shipments.
|
| 1307 |
TIG_PostNL::Default Belgium COD shipping option,Default Belgium COD shipping option
|
| 1308 |
TIG_PostNL::PostNL delivery options are only available when shipping from the Netherlands.,PostNL delivery options are only available when shipping from the Netherlands.
|
| 1309 |
TIG_PostNL::Delivery options are only available when shipping from the Netherlands.,Delivery options are only available when shipping from the Netherlands.
|
| 1314 |
"TIG_PostNL::You can read more about monday delivery <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/maandagbezorging/"" target=""_blank"" title=""monday delivery"">here</a>.","You can read more about monday delivery <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/maandagbezorging/"" target=""_blank"" title=""monday delivery"">here</a>."
|
| 1315 |
"TIG_PostNL::You can read more about sunday delivery <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/zondagbezorging/"" target=""_blank"" title=""sunday delivery"">here</a>.","You can read more about sunday delivery <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/zondagbezorging/"" target=""_blank"" title=""sunday delivery"">here</a>."
|
| 1316 |
TIG_PostNL::sunday,sunday
|
| 1317 |
+
TIG_PostNL::Same Day Delivery,Same Day Delivery
|
| 1318 |
+
TIG_PostNL::same day,same day
|
| 1319 |
+
TIG_PostNL::Enable same day delivery,Enable same day delivery
|
| 1320 |
+
"TIG_PostNL::You can read more about same day delivery <a href="""" target=""_blank"" title=""same day delivery"">here</a>.","You can read more about same day delivery <a href="""" target=""_blank"" title=""same day delivery"">here</a>."
|
| 1321 |
+
TIG_PostNL::Activate same day delivery for your customers.,Activate same day delivery for your customers.
|
| 1322 |
+
TIG_PostNL::Same day delivery fee,Same day delivery fee
|
| 1323 |
+
TIG_PostNL::Additional costs for same day delivery in the store's base currency. This fee will be added to the shipping costs. Leave this field empty to charge no extra fee for same day delivery.,Additional costs for same day delivery in the store's base currency. This fee will be added to the shipping costs. Leave this field empty to charge no extra fee for same day delivery.
|
| 1324 |
+
TIG_PostNL::Default same day delivery shipping option,Default same day delivery shipping option
|
| 1325 |
+
TIG_PostNL::This setting may be overwritten by manually creating shipments.,This setting may be overwritten by manually creating shipments.
|
| 1326 |
+
TIG_PostNL::Sunday delivery fee,Sunday delivery fee
|
| 1327 |
+
TIG_PostNL::Additional costs for sunday delivery in the store's base currency. This fee will be added to the shipping costs. Leave this field empty to charge no extra fee for sunday delivery.,Additional costs for sunday delivery in the store's base currency. This fee will be added to the shipping costs. Leave this field empty to charge no extra fee for sunday delivery.
|
| 1328 |
+
TIG_PostNL::Same day delivery cut-off time,Same day delivery cut-off time
|
| 1329 |
+
TIG_PostNL::Same day delivery will only be available when starting an order before this time. Please enter this time in the %s time zone.,Same day delivery will only be available when starting an order before this time. Please enter this time in the %s time zone.
|
| 1330 |
+
TIG_PostNL::N/A,N/A
|
app/locale/en_US/template/email/TIG/PostNL/return_label.html
CHANGED
|
@@ -27,7 +27,7 @@
|
|
| 27 |
<!-- [ middle starts here] -->
|
| 28 |
<tr>
|
| 29 |
<td valign="top">
|
| 30 |
-
<p style="font-size:11px; font-weight:normal; line-height:1.5em; margin:0 0 11px 0;">Dear Sir, Madam {{htmlescape var=$
|
| 31 |
<p style="font-size:11px; line-height:1.5em; margin:0 0 8px 0;">Enclosed you will find a PostNL return label with which you may return your order to {{var store.getFrontendName()}}.</p>
|
| 32 |
<p style="font-size:11px; line-height:1.5em; margin:0;">Please make sure the product is securely packaged. You can then attach the label to the top of the parcel. Please make sure the barcode is clearly visible.<p>
|
| 33 |
<p style="font-size:11px; line-height:1.5em; margin:0;">To track the progress of your return shipment click <a href="{{var return_barcode_url}}" target="_blank">here</a>.<p>
|
| 27 |
<!-- [ middle starts here] -->
|
| 28 |
<tr>
|
| 29 |
<td valign="top">
|
| 30 |
+
<p style="font-size:11px; font-weight:normal; line-height:1.5em; margin:0 0 11px 0;">Dear Sir, Madam {{htmlescape var=$order.getCustomerName()}},</p>
|
| 31 |
<p style="font-size:11px; line-height:1.5em; margin:0 0 8px 0;">Enclosed you will find a PostNL return label with which you may return your order to {{var store.getFrontendName()}}.</p>
|
| 32 |
<p style="font-size:11px; line-height:1.5em; margin:0;">Please make sure the product is securely packaged. You can then attach the label to the top of the parcel. Please make sure the barcode is clearly visible.<p>
|
| 33 |
<p style="font-size:11px; line-height:1.5em; margin:0;">To track the progress of your return shipment click <a href="{{var return_barcode_url}}" target="_blank">here</a>.<p>
|
app/locale/en_US/template/email/TIG/PostNL/track_and_trace.html
CHANGED
|
@@ -25,7 +25,7 @@
|
|
| 25 |
<!-- [ middle starts here] -->
|
| 26 |
<tr>
|
| 27 |
<td valign="top">
|
| 28 |
-
<p style="font-size:11px; font-weight:normal; line-height:1.5em; margin:0 0 11px 0;">Dear Sir, Madam {{htmlescape var=$
|
| 29 |
<p style="font-size:11px; line-height:1.5em; margin:0 0 8px 0;">Your order at {{var store.getFrontendName()}}, with barcode {{var barcode}} will be delivered by PostNL.</p>
|
| 30 |
<p style="font-size:11px; line-height:1.5em; margin:0;">To track the progress of your shipment click <a href="{{var barcode_url}}" target="_blank">here</a>.<p>
|
| 31 |
<p style="font-size:11px; line-height:1.5em; margin:0;">Kind Regards,</p>
|
| 25 |
<!-- [ middle starts here] -->
|
| 26 |
<tr>
|
| 27 |
<td valign="top">
|
| 28 |
+
<p style="font-size:11px; font-weight:normal; line-height:1.5em; margin:0 0 11px 0;">Dear Sir, Madam {{htmlescape var=$order.getCustomerName()}},</p>
|
| 29 |
<p style="font-size:11px; line-height:1.5em; margin:0 0 8px 0;">Your order at {{var store.getFrontendName()}}, with barcode {{var barcode}} will be delivered by PostNL.</p>
|
| 30 |
<p style="font-size:11px; line-height:1.5em; margin:0;">To track the progress of your shipment click <a href="{{var barcode_url}}" target="_blank">here</a>.<p>
|
| 31 |
<p style="font-size:11px; line-height:1.5em; margin:0;">Kind Regards,</p>
|
app/locale/nl_NL/TIG_PostNL.csv
CHANGED
|
@@ -92,7 +92,7 @@ TIG_PostNL::Use only the primary sender address,Gebruik enkel het primaire afzen
|
|
| 92 |
TIG_PostNL::Product Options,Productopties
|
| 93 |
TIG_PostNL::Select selectable option,Selecteer de beschikbare opties
|
| 94 |
TIG_PostNL::Default shipping option,Standaard verzendoptie
|
| 95 |
-
TIG_PostNL::This setting may be overwritten by
|
| 96 |
TIG_PostNL::Use an alternative default option,Gebruik een alternatieve standaard optie
|
| 97 |
TIG_PostNL::Enable this to use an alternative default option when a shipment's total value exceeds a certain amount.,Zet deze aan als u een alternatieve standaardwaarde gebruikt als de totaalwaarde van de zending groter is dan een bepaald bedrag.
|
| 98 |
TIG_PostNL::Maximum amount,Maximaal bedrag
|
|
@@ -661,7 +661,7 @@ TIG_PostNL::Invalid response for GetNearestLocations request: %s,Ongeldig antwoo
|
|
| 661 |
TIG_PostNL::Invalid arguments supplied. GetDeliveryTimeframes requires a postcode and a housenumber.,Ongeldige argumenten aangegeven. GetDeliveryTimeframes verwacht een postcode en een huisnummer.
|
| 662 |
TIG_PostNL::Invalid postcode supplied for GetDeliveryTimeframes request: %s Postcodes may only contain 4 numbers and 2 letters.,Ongeldige postcode aangegeven voor het GetDeliveryTimeframes verzoek: %s Postcodes mogen enkel 4 cijfers en 2 letters bevatten.
|
| 663 |
TIG_PostNL::Invalid housenumber supplied for GetDeliveryTimeframes request: %s Housenumbers may only contain digits.,Ongeldig huisnummer aangegeven voor het GetDeliveryTimeframes verzoek: %s. Huisnummers mogen enkel getallen bevatten.
|
| 664 |
-
TIG_PostNL::Invalid shipping duration: %s. Shipping duration must be between
|
| 665 |
TIG_PostNL::Invalid arguments supplied. getNearestLocationsInArea requires two sets of coordinates.,Ongeldige argumenten aangegeven. getNearestLocations verwacht 2 sets aan coördinaten.
|
| 666 |
"TIG_PostNL::Invalid NE coordinates supplied for getLocationsInArea request. lat: %s, long: %s","Ongeldige NE coördinaten aangegeven voor het getNearestLocations verzoek. lat: %s, long: %s"
|
| 667 |
"TIG_PostNL::Invalid SW coordinates supplied for getLocationsInArea request. lat: %s, long: %s","Ongeldige SW coördinaten aangegeven voor het getNearestLocations verzoek. lat: %s, long: %s"
|
|
@@ -695,7 +695,7 @@ TIG_PostNL::Invalid arguments supplied. The 'number' parameter is required.,Onge
|
|
| 695 |
TIG_PostNL::Invalid mobile phone number supplied: %s.,Ongeldig mobiel telefoonnummer opgegeven : %s.
|
| 696 |
TIG_PostNL::The quote's total weight is below the miniumum required to use PostNL delivery options.,Het totale gewicht van de bestelling is beneden het minimum om gebruik te maken van PostNL bezorgopties.
|
| 697 |
TIG_PostNL::Invalid arguments supplied. The 'costs' parameter requires an amount incl. and excl. VAT.,Ongeldige parameters opgegeven. De 'costs' parameter moet een bedrag incl. en excl. BTW bevatten.
|
| 698 |
-
TIG_PostNL::Invalid fee amount entered: %s incl. VAT. Please enter a value between %.2f and %.2f %s incl. VAT.,
|
| 699 |
TIG_PostNL::The PostNL Extension is currently configured in test mode.,De PostNL extensie is momenteel geconfigureerd in test modus.
|
| 700 |
"TIG_PostNL::You can enter your live username and password in the 'Account Settings' tab. Don't forget to also update your customer number, customer code and BLS (location) code. You can then set the extension to live mode.","U kunt uw live gebruikersnaam en wachtwoord invullen onder het 'Account Instellingen' tabje. Vergeet hier niet ook uw klantnummer, klantcode en BLS (locatie) code in te vullen. U kunt vervolgens de extensie op live modus zetten."
|
| 701 |
"TIG_PostNL::You may test the extension, however you cannot send any shipments in this mode. Any shipments that you confirm or whose labels you print while in this mode will be registered as test shipments and may not be physically shipped. If you attempt to do so, you may incur fines from PostNL. To use the extension in live mode you first need to enter your PostNL account credentials and set the extension to live mode. You can then send shipments using the PostNL extension.","U kunt de extensie testen, maar u kunt geen zendingen versturen in test modus. Als u een zending voormeldt of de labels print van een zending terwijl de extensie in test modus staat, zullen deze zendingen gemarkeerd worden als testzendingen. Deze testzendingen kunt u niet versturen. Indien u deze wel verzendt, zult u boetes oplopen bij PostNL. Om de extensie in livemodus te gebruiken, dient u eerst uw PostNL accountgegevens in te voeren en de configuratie op livemodus in te stellen. Vervolgens kunt u zendingen versturen met de PostNL extensie."
|
|
@@ -726,7 +726,7 @@ TIG_PostNL::Delete Shipping Labels,Verzendlabels Verwijderen
|
|
| 726 |
TIG_PostNL::The current user is not allowed to perform this action.,De huidige gebruiker heeft geen toegang tot deze actie.
|
| 727 |
Actions,Acties
|
| 728 |
TIG_PostNL::Default evening delivery shipping option,Standaard avondbezorging verzendoptie
|
| 729 |
-
TIG_PostNL::This setting may be overwritten by
|
| 730 |
TIG_PostNL::Default early post office pickup option,Standaard extra vroeg ophalen optie
|
| 731 |
TIG_PostNL::This setting can be overwritten by manually creating shipments. This option is only applicable to early pickup Post Office shipments.,Deze instelling kan overschreven worden door handmatig zendingen aan te maken. Deze optie is enkel van toepassing op extra vroeg ophalen op het postkantoor zendingen.
|
| 732 |
TIG_PostNL::Default shipment type,Standaard zending type
|
|
@@ -957,9 +957,9 @@ TIG_PostNL::Letter box qty,Brievenbuspakje hoeveelheid
|
|
| 957 |
TIG_PostNL::No Confirmation Required,Geen Voormelding Nodig
|
| 958 |
TIG_PostNL::The following options are only for COD orders.,De volgende opties zijn enkel van toepassing op rembours bestellingen.
|
| 959 |
TIG_PostNL::Default COD shipping option,Standaard rembours verzendoptie
|
| 960 |
-
TIG_PostNL::This setting may be overwritten by
|
| 961 |
TIG_PostNL::Default evening COD delivery shipping option,Standaard avondbezorging rembours verzendoptie
|
| 962 |
-
TIG_PostNL::This setting may be overwritten by
|
| 963 |
TIG_PostNL::Default 'deliver at the Post Office' COD option,Standaard 'afhalen op postkantoor' rembours optie
|
| 964 |
TIG_PostNL::This setting can be overwritten by manually creating shipments. This option is only applicable to Post Office COD shipments.,Deze instelling kan worden overschreven door handmatig zendingen aan te maken. Deze instelling is enkel van toepassing op postkantoor rembours zendingen.
|
| 965 |
TIG_PostNL::Default early post office pickup COD option,Standaard extra vroeg ophalen rembours optie
|
|
@@ -1290,7 +1290,7 @@ TIG_PostNL::Loading available delivery options for your shipping address...,De b
|
|
| 1290 |
TIG_PostNL::Picqer's PostNL add-on version,Picqer's PostNL add-on versie
|
| 1291 |
TIG_PostNL::Default sunday delivery shipping option,Standaard zondagbezorging verzendoptie
|
| 1292 |
TIG_PostNL::Enable sunday delivery,Activeer zondagbezorging
|
| 1293 |
-
TIG_PostNL::This setting may be overwritten by
|
| 1294 |
TIG_PostNL::Activate sunday delivery for your customers.,Activeer zondagbezorging voor uw klanten.
|
| 1295 |
TIG_PostNL::Sunday Delivery,Zondagbezorging
|
| 1296 |
TIG_PostNL::Sunday,Zondag
|
|
@@ -1306,9 +1306,9 @@ TIG_PostNL::Belgium COD + Return when not home,België Extra dekking (EUR 500) +
|
|
| 1306 |
TIG_PostNL::Belgium Extra cover (EUR 500)+ Return when not home + Deliver to stated address only,België Extra dekking (EUR 500) + Retour indien niet thuis + Lever alleen aan opgegeven adres
|
| 1307 |
TIG_PostNL::Belgium COD + Extra cover (EUR 500) + Return when not home,België Extra dekking (EUR 500) + Retour indien niet thuis + Lever alleen aan opgegeven adres
|
| 1308 |
TIG_PostNL::Default Belgium shipping option,Standaard België verzendoptie
|
| 1309 |
-
TIG_PostNL::This setting may be overwritten by
|
| 1310 |
TIG_PostNL::Default Belgium COD shipping option,Standaard België rembours verzendoptie
|
| 1311 |
-
TIG_PostNL::PostNL delivery options are only available when shipping from the Netherlands.,PostNL bezorgopties zijn alleen beschikbaar wanneer
|
| 1312 |
TIG_PostNL::Delivery options are only available when shipping from the Netherlands.,Bezorgopties zijn alleen beschikbaar wanneer u verstuurd vanuit Nederland.
|
| 1313 |
TIG_PostNL::Delivery options based on contractual agreements,Bezorgopties op basis van contractafspraken
|
| 1314 |
TIG_PostNL::Please note: these delivery options require specific contractual agreements with PostNL. Please contact your PostNL account manager if you wish to use monday and/or sunday delivery.,Let op: voor deze bezorgopties moet u specifieke afspraken maken met PostNL. Neem contact op met uw Account Manager als u gebruik wil maken van maandagbezorging en/of zondagbezorging.
|
|
@@ -1317,5 +1317,34 @@ TIG_PostNL::Activate monday delivery (also known as sunday sorting) for your cus
|
|
| 1317 |
"TIG_PostNL::You can read more about monday delivery <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/maandagbezorging/"" target=""_blank"" title=""monday delivery"">here</a>.","U kunt <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/maandagbezorging/"" target=""_blank"" title=""maandagbezorging"">hier</a> meer lezen over maandagbezorging."
|
| 1318 |
"TIG_PostNL::You can read more about sunday delivery <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/zondagbezorging/"" target=""_blank"" title=""sunday delivery"">here</a>.","U kunt <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/zondagbezorging/"" target=""_blank"" title=""zondagbezorging"">hier</a> meer lezen over zondagbezorging."
|
| 1319 |
TIG_PostNL::sunday,zondag
|
| 1320 |
-
TIG_PostNL::
|
| 1321 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 92 |
TIG_PostNL::Product Options,Productopties
|
| 93 |
TIG_PostNL::Select selectable option,Selecteer de beschikbare opties
|
| 94 |
TIG_PostNL::Default shipping option,Standaard verzendoptie
|
| 95 |
+
TIG_PostNL::This setting may be overwritten by manually creating shipments. This option is only applicable to domestic shipments.,Deze instelling kan overschreven worden door handmatig een zending aan te maken. Deze instelling is enkel van toepassing op binnenlandse zendingen.
|
| 96 |
TIG_PostNL::Use an alternative default option,Gebruik een alternatieve standaard optie
|
| 97 |
TIG_PostNL::Enable this to use an alternative default option when a shipment's total value exceeds a certain amount.,Zet deze aan als u een alternatieve standaardwaarde gebruikt als de totaalwaarde van de zending groter is dan een bepaald bedrag.
|
| 98 |
TIG_PostNL::Maximum amount,Maximaal bedrag
|
| 661 |
TIG_PostNL::Invalid arguments supplied. GetDeliveryTimeframes requires a postcode and a housenumber.,Ongeldige argumenten aangegeven. GetDeliveryTimeframes verwacht een postcode en een huisnummer.
|
| 662 |
TIG_PostNL::Invalid postcode supplied for GetDeliveryTimeframes request: %s Postcodes may only contain 4 numbers and 2 letters.,Ongeldige postcode aangegeven voor het GetDeliveryTimeframes verzoek: %s Postcodes mogen enkel 4 cijfers en 2 letters bevatten.
|
| 663 |
TIG_PostNL::Invalid housenumber supplied for GetDeliveryTimeframes request: %s Housenumbers may only contain digits.,Ongeldig huisnummer aangegeven voor het GetDeliveryTimeframes verzoek: %s. Huisnummers mogen enkel getallen bevatten.
|
| 664 |
+
TIG_PostNL::Invalid shipping duration: %s. Shipping duration must be between 0 and 14 days.,Ongeldige overkomstduur: %s De overkomstduur moet tussen de 0 en 14 dagen liggen.
|
| 665 |
TIG_PostNL::Invalid arguments supplied. getNearestLocationsInArea requires two sets of coordinates.,Ongeldige argumenten aangegeven. getNearestLocations verwacht 2 sets aan coördinaten.
|
| 666 |
"TIG_PostNL::Invalid NE coordinates supplied for getLocationsInArea request. lat: %s, long: %s","Ongeldige NE coördinaten aangegeven voor het getNearestLocations verzoek. lat: %s, long: %s"
|
| 667 |
"TIG_PostNL::Invalid SW coordinates supplied for getLocationsInArea request. lat: %s, long: %s","Ongeldige SW coördinaten aangegeven voor het getNearestLocations verzoek. lat: %s, long: %s"
|
| 695 |
TIG_PostNL::Invalid mobile phone number supplied: %s.,Ongeldig mobiel telefoonnummer opgegeven : %s.
|
| 696 |
TIG_PostNL::The quote's total weight is below the miniumum required to use PostNL delivery options.,Het totale gewicht van de bestelling is beneden het minimum om gebruik te maken van PostNL bezorgopties.
|
| 697 |
TIG_PostNL::Invalid arguments supplied. The 'costs' parameter requires an amount incl. and excl. VAT.,Ongeldige parameters opgegeven. De 'costs' parameter moet een bedrag incl. en excl. BTW bevatten.
|
| 698 |
+
TIG_PostNL::Invalid fee amount entered: %s incl. VAT. Please enter a value between %.2f and %.2f %s incl. VAT.,Invalid fee amount entered: %s incl. VAT. Please enter a value between %.2f and %.2f %s incl. VAT.
|
| 699 |
TIG_PostNL::The PostNL Extension is currently configured in test mode.,De PostNL extensie is momenteel geconfigureerd in test modus.
|
| 700 |
"TIG_PostNL::You can enter your live username and password in the 'Account Settings' tab. Don't forget to also update your customer number, customer code and BLS (location) code. You can then set the extension to live mode.","U kunt uw live gebruikersnaam en wachtwoord invullen onder het 'Account Instellingen' tabje. Vergeet hier niet ook uw klantnummer, klantcode en BLS (locatie) code in te vullen. U kunt vervolgens de extensie op live modus zetten."
|
| 701 |
"TIG_PostNL::You may test the extension, however you cannot send any shipments in this mode. Any shipments that you confirm or whose labels you print while in this mode will be registered as test shipments and may not be physically shipped. If you attempt to do so, you may incur fines from PostNL. To use the extension in live mode you first need to enter your PostNL account credentials and set the extension to live mode. You can then send shipments using the PostNL extension.","U kunt de extensie testen, maar u kunt geen zendingen versturen in test modus. Als u een zending voormeldt of de labels print van een zending terwijl de extensie in test modus staat, zullen deze zendingen gemarkeerd worden als testzendingen. Deze testzendingen kunt u niet versturen. Indien u deze wel verzendt, zult u boetes oplopen bij PostNL. Om de extensie in livemodus te gebruiken, dient u eerst uw PostNL accountgegevens in te voeren en de configuratie op livemodus in te stellen. Vervolgens kunt u zendingen versturen met de PostNL extensie."
|
| 726 |
TIG_PostNL::The current user is not allowed to perform this action.,De huidige gebruiker heeft geen toegang tot deze actie.
|
| 727 |
Actions,Acties
|
| 728 |
TIG_PostNL::Default evening delivery shipping option,Standaard avondbezorging verzendoptie
|
| 729 |
+
TIG_PostNL::This setting may be overwritten by manually creating shipments. This option is only applicable to domestic evening delivery shipments.,Deze instelling kan overschreven worden door handmatig zendingen aan te maken. Deze optie is enkel van toepassing op avondzendingen.
|
| 730 |
TIG_PostNL::Default early post office pickup option,Standaard extra vroeg ophalen optie
|
| 731 |
TIG_PostNL::This setting can be overwritten by manually creating shipments. This option is only applicable to early pickup Post Office shipments.,Deze instelling kan overschreven worden door handmatig zendingen aan te maken. Deze optie is enkel van toepassing op extra vroeg ophalen op het postkantoor zendingen.
|
| 732 |
TIG_PostNL::Default shipment type,Standaard zending type
|
| 957 |
TIG_PostNL::No Confirmation Required,Geen Voormelding Nodig
|
| 958 |
TIG_PostNL::The following options are only for COD orders.,De volgende opties zijn enkel van toepassing op rembours bestellingen.
|
| 959 |
TIG_PostNL::Default COD shipping option,Standaard rembours verzendoptie
|
| 960 |
+
TIG_PostNL::This setting may be overwritten by manually creating shipments. This option is only applicable to domestic COD shipments.,Deze instelling kan overschreven worden door handmatig een zending aan te maken. Deze instelling is enkel van toepassing op binnenlandse rembours zendingen.
|
| 961 |
TIG_PostNL::Default evening COD delivery shipping option,Standaard avondbezorging rembours verzendoptie
|
| 962 |
+
TIG_PostNL::This setting may be overwritten by manually creating shipments. This option is only applicable to domestic evening delivery shipments.,Deze instelling kan overschreven worden door handmatig zendingen aan te maken. Deze optie is enkel van toepassing op avondbezorging rembours zendingen.
|
| 963 |
TIG_PostNL::Default 'deliver at the Post Office' COD option,Standaard 'afhalen op postkantoor' rembours optie
|
| 964 |
TIG_PostNL::This setting can be overwritten by manually creating shipments. This option is only applicable to Post Office COD shipments.,Deze instelling kan worden overschreven door handmatig zendingen aan te maken. Deze instelling is enkel van toepassing op postkantoor rembours zendingen.
|
| 965 |
TIG_PostNL::Default early post office pickup COD option,Standaard extra vroeg ophalen rembours optie
|
| 1290 |
TIG_PostNL::Picqer's PostNL add-on version,Picqer's PostNL add-on versie
|
| 1291 |
TIG_PostNL::Default sunday delivery shipping option,Standaard zondagbezorging verzendoptie
|
| 1292 |
TIG_PostNL::Enable sunday delivery,Activeer zondagbezorging
|
| 1293 |
+
TIG_PostNL::This setting may be overwritten by manually creating shipments.,Deze instelling kan overschreven worden door handmatig zendingen aan te maken.
|
| 1294 |
TIG_PostNL::Activate sunday delivery for your customers.,Activeer zondagbezorging voor uw klanten.
|
| 1295 |
TIG_PostNL::Sunday Delivery,Zondagbezorging
|
| 1296 |
TIG_PostNL::Sunday,Zondag
|
| 1306 |
TIG_PostNL::Belgium Extra cover (EUR 500)+ Return when not home + Deliver to stated address only,België Extra dekking (EUR 500) + Retour indien niet thuis + Lever alleen aan opgegeven adres
|
| 1307 |
TIG_PostNL::Belgium COD + Extra cover (EUR 500) + Return when not home,België Extra dekking (EUR 500) + Retour indien niet thuis + Lever alleen aan opgegeven adres
|
| 1308 |
TIG_PostNL::Default Belgium shipping option,Standaard België verzendoptie
|
| 1309 |
+
TIG_PostNL::This setting may be overwritten by manually creating shipments. This option is only applicable to Belgian domestic shipments.,Deze instelling kan overschreven worden door handmatig zendingen aan te maken. Deze optie is enkel van toepassing op Belgische binnenlandse zendingen.
|
| 1310 |
TIG_PostNL::Default Belgium COD shipping option,Standaard België rembours verzendoptie
|
| 1311 |
+
TIG_PostNL::PostNL delivery options are only available when shipping from the Netherlands.,PostNL bezorgopties zijn alleen beschikbaar wanneer u verstuurd vanuit Nederland.
|
| 1312 |
TIG_PostNL::Delivery options are only available when shipping from the Netherlands.,Bezorgopties zijn alleen beschikbaar wanneer u verstuurd vanuit Nederland.
|
| 1313 |
TIG_PostNL::Delivery options based on contractual agreements,Bezorgopties op basis van contractafspraken
|
| 1314 |
TIG_PostNL::Please note: these delivery options require specific contractual agreements with PostNL. Please contact your PostNL account manager if you wish to use monday and/or sunday delivery.,Let op: voor deze bezorgopties moet u specifieke afspraken maken met PostNL. Neem contact op met uw Account Manager als u gebruik wil maken van maandagbezorging en/of zondagbezorging.
|
| 1317 |
"TIG_PostNL::You can read more about monday delivery <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/maandagbezorging/"" target=""_blank"" title=""monday delivery"">here</a>.","U kunt <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/maandagbezorging/"" target=""_blank"" title=""maandagbezorging"">hier</a> meer lezen over maandagbezorging."
|
| 1318 |
"TIG_PostNL::You can read more about sunday delivery <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/zondagbezorging/"" target=""_blank"" title=""sunday delivery"">here</a>.","U kunt <a href=""http://www.postnl.nl/zakelijke-oplossingen/webwinkels/bezorgopties-voor-mijn-klanten/zondagbezorging/"" target=""_blank"" title=""zondagbezorging"">hier</a> meer lezen over zondagbezorging."
|
| 1319 |
TIG_PostNL::sunday,zondag
|
| 1320 |
+
TIG_PostNL::monday,maandag
|
| 1321 |
+
TIG_PostNL::Same Day Delivery,Zelfde Dag Bezorging
|
| 1322 |
+
TIG_PostNL::same day,zelfde dag
|
| 1323 |
+
TIG_PostNL::Enable same day delivery,Activeer zelfde dag bezorging
|
| 1324 |
+
"TIG_PostNL::You can read more about same day delivery <a href="""" target=""_blank"" title=""same day delivery"">here</a>.","U kunt <a href="""" target=""_blank"" title=""zelfde dag bezorging"">hier</a> meer lezen over zelfde dag bezorging."
|
| 1325 |
+
TIG_PostNL::Activate same day delivery for your customers.,Activeer zelfde dag bezorging voor uw klanten.
|
| 1326 |
+
TIG_PostNL::Same day delivery fee,Zelfde dag bezorging toeslag
|
| 1327 |
+
TIG_PostNL::Additional costs for same day delivery in the store's base currency. This fee will be added to the shipping costs. Leave this field empty to charge no extra fee for same day delivery.,"Additionele kosten voor het gebruik van zelfde dag bezorging in de basis valuta van de storeview. Deze kosten zullen opgeteld worden bij de verzendkosten. Deze kosten moeten tussen de 0,00 en 20,00 EUR liggen incl. BTW. Laat dit veld leeg om geen extra kosten in rekening te brengen voor het gebruik van zelfde dag bezorging."
|
| 1328 |
+
TIG_PostNL::Default same day delivery shipping option,Standaard zelfde dag bezorging verzendoptie
|
| 1329 |
+
TIG_PostNL::This setting may be overwritten by manually creating shipments.,Deze instelling kan overschreven worden door handmatig zendingen aan te maken. Deze optie is enkel van toepassing op zelfde dag bezorging bestellingen.
|
| 1330 |
+
TIG_PostNL::Sunday delivery fee,Zondagbezorging toeslag
|
| 1331 |
+
TIG_PostNL::Additional costs for sunday delivery in the store's base currency. This fee will be added to the shipping costs. Leave this field empty to charge no extra fee for sunday delivery.,Additionele kosten voor het gebruik van zelfde dag bezorging in de basis valuta van de storeview. Deze kosten zullen opgeteld worden bij de verzendkosten. Laat dit veld leeg om geen extra kosten in rekening te brengen voor het gebruik van zondagbezorging.
|
| 1332 |
+
TIG_PostNL::Same day delivery cut-off time,Zelfde dag bezorging cut-off tijd
|
| 1333 |
+
TIG_PostNL::Same day delivery will only be available when starting an order before this time. Please enter this time in the %s time zone.,Zelfde dag bezorging is alleen beschikbaar voor bestellingen die geïnitieerd worden voor deze tijd. Vul de tijd s.v.p. in in de %s tijdzone.
|
| 1334 |
+
TIG_PostNL::N/A,N.v.t.
|
| 1335 |
+
TIG_PostNL::monday,maandag
|
| 1336 |
+
TIG_PostNL::Monday Delivery,Maandagbezorging
|
| 1337 |
+
TIG_PostNL::Domestic (COD),Binnenland (rembours)
|
| 1338 |
+
TIG_PostNL::PakjeGemak (COD),PakjeGemak (rembours)
|
| 1339 |
+
TIG_PostNL::Evening Delivery (COD),Avondbezorging (rembours)
|
| 1340 |
+
TIG_PostNL::Early Pickup (COD),Extra Vroeg Ophalen (rembours)
|
| 1341 |
+
TIG_PostNL::Activate monday delivery (also known as sunday sorting) for your customers. Note: this only applies to home deliveries. Postal office deliveries will not take place on Monday.,Activeer maandagbezorging (ook bekend als zondagsortering) voor uw klanten. Let op: maandagbezorging geldt alleen voor huisadressen. Postkantoor bezorgingen worden niet op maandag geleverd.
|
| 1342 |
+
TIG_PostNL::Name,Naam
|
| 1343 |
+
TIG_PostNL::Vat,Btw
|
| 1344 |
+
TIG_PostNL::Shipping & Handling:,Verzendkosten:
|
| 1345 |
+
TIG_PostNL::Subtotal (Excl. Tax):,Subtotaal (Ex. Btw):
|
| 1346 |
+
TIG_PostNL::Subtotal (Incl. Tax):,Subtotaal (Inc. Btw):
|
| 1347 |
+
TIG_PostNL::Shipping (Excl. Tax):,Verzendkosten (Ex. Btw):
|
| 1348 |
+
TIG_PostNL::Shipping (Incl. Tax):,Verzendkosten (Inc. Btw):
|
| 1349 |
+
TIG_PostNL::Grand Total (Excl. Tax):,Totaal (Ex. Btw):
|
| 1350 |
+
TIG_PostNL::Grand Total (Incl. Tax):,Totaal (Inc. Btw):
|
app/locale/nl_NL/template/email/TIG/PostNL/return_label.html
CHANGED
|
@@ -27,7 +27,7 @@
|
|
| 27 |
<!-- [ middle starts here] -->
|
| 28 |
<tr>
|
| 29 |
<td valign="top">
|
| 30 |
-
<p style="font-size:11px; font-weight:normal; line-height:1.5em; margin:0 0 11px 0;">Beste heer/mevrouw {{htmlescape var=$
|
| 31 |
<p style="font-size:11px; line-height:1.5em; margin:0 0 8px 0;">Bijgevoegd vindt u een PostNL retourlabel waarmee u uw bestelling kunt retourneren aan {{var store.getFrontendName()}}.</p>
|
| 32 |
<p style="font-size:11px; line-height:1.5em; margin:0;">Verpak de producten in een stevige verpakking en plak het retourlabel bovenop het pakket. Zorg er s.v.p. voor dat de barcode goed en duidelijk leesbaar is.<p>
|
| 33 |
<p style="font-size:11px; line-height:1.5em; margin:0;">U kunt de status van uw retourzending <a href="{{var return_barcode_url}}" target="_blank">hier</a> volgen.<p>
|
| 27 |
<!-- [ middle starts here] -->
|
| 28 |
<tr>
|
| 29 |
<td valign="top">
|
| 30 |
+
<p style="font-size:11px; font-weight:normal; line-height:1.5em; margin:0 0 11px 0;">Beste heer/mevrouw {{htmlescape var=$order.getCustomerName()}},</p>
|
| 31 |
<p style="font-size:11px; line-height:1.5em; margin:0 0 8px 0;">Bijgevoegd vindt u een PostNL retourlabel waarmee u uw bestelling kunt retourneren aan {{var store.getFrontendName()}}.</p>
|
| 32 |
<p style="font-size:11px; line-height:1.5em; margin:0;">Verpak de producten in een stevige verpakking en plak het retourlabel bovenop het pakket. Zorg er s.v.p. voor dat de barcode goed en duidelijk leesbaar is.<p>
|
| 33 |
<p style="font-size:11px; line-height:1.5em; margin:0;">U kunt de status van uw retourzending <a href="{{var return_barcode_url}}" target="_blank">hier</a> volgen.<p>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>tig_postnl</name>
|
| 4 |
-
<version>1.7.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US">Creative Commons License</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -20,7 +20,25 @@ Services included:
|
|
| 20 |
- Viewing detailed shipping status information
|
| 21 |
- PostNL Checkout
|
| 22 |
- Emailing customers track & trace information, allowing them to track their shipment from the moment you confirm it to the moment it arrives at their doorstep</description>
|
| 23 |
-
<notes>==== v1.7.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 24 |
==== Improvements ====
|
| 25 |
- Refactored references to the TIG_POstNL_Helper_DeliveryOptions class' fee methods so they now call their counterparts in the TIG_PostNL_Helper_DeliveryOptions_Fee class
|
| 26 |
- Refactored the canUseDeliveryOptions method for GoMage LightCheckout to improve performance
|
|
@@ -421,9 +439,9 @@ Services included:
|
|
| 421 |

|
| 422 |
This is the initial beta release of the extension. If you have any questions, please contact the Total Internet Group Servicedesk</notes>
|
| 423 |
<authors><author><name>TiG</name><user>supporttotal</user><email>servicedesk@totalinternetgroup.nl</email></author></authors>
|
| 424 |
-
<date>
|
| 425 |
-
<time>
|
| 426 |
-
<contents><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="TIG"><file name="postnl.xml" hash="9e82023fd46f786583dba4afd3b2da48"/></dir></dir><dir name="template"><dir name="TIG"><dir name="PostNL"><dir name="address_validation"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="0cb781955d33fae46da09d62bd6fdaf3"/><file name="postcode_check.phtml" hash="bb41cb9863f2a6a85cf1110c2cab8160"/><file name="shipping.phtml" hash="202f4808d3658d510175c6b975991da5"/></dir></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash="eb3f3f53d153c42165cf70085e026b60"/><file name="postcode_check.phtml" hash="cbb8bfd76db65041cafacf976312ceb7"/></dir></dir><dir name="gomage_checkout"><file name="billing.phtml" hash="e185cac738b3e9808fb41131e257f2a6"/><file name="postcode_check.phtml" hash="2b52392607c53b194470edc10a42a47e"/><file name="shipping.phtml" hash="13ce6e8d74a737ca25f2e57bcb237b9a"/></dir><dir name="onestepcheckout"><file name="billing_fields.phtml" hash="1e04cda4539618f3738fea300682e8e9"/><file name="postcode_check.phtml" hash="9dd6f336942b9cfcfc1a8b26c283b143"/><file name="shipping_fields.phtml" hash="ed8e95313ca98b83f7acbe94ea39876b"/></dir><file name="validate.phtml" hash="75438f5484ae966f288b7bde7e225b0a"/></dir><dir name="checkout"><dir name="cart"><file name="js.phtml" hash="a9718e822a674ae768bc6a532bbb0e13"/><file name="link.phtml" hash="ecd5c96cb1a46f51270c3784232a5c47"/><file name="spinner.phtml" hash="26b8da7f12ef206b9768b325ad547c1b"/></dir><file name="summary.phtml" hash="0b5ba3d2ef1b1d17eca3c3bc603c265f"/></dir><dir name="core"><dir name="order"><dir name="returns"><file name="info.phtml" hash="1eb800d518ea4ac848c42850c6983b66"/><dir name="shipment"><file name="items.phtml" hash="a6b56265412c3e0f24e4cfc6b44e145d"/></dir></dir></dir><dir name="page"><dir name="html"><file name="js_translate.phtml" hash="3a12ce7789322fd513435101b5763811"/></dir></dir><dir name="sales"><dir name="order"><dir name="email"><file name="delivery_options.phtml" hash="69ed5e3c4f9c5892e79fc862ae1af977"/><file name="pakjegemak_address.phtml" hash="4d66bc2a22d6916c8fe5388cf12b734a"/></dir><file name="pakje_gemak_address.phtml" hash="9c3f945dc11c6e7ab11c2a801c15617d"/><dir name="shipment"><file name="shipping_status.phtml" hash="e20200a32d1f40f661260e58ded904b9"/></dir></dir></dir></dir><dir name="delivery_options"><file name="addlocation.phtml" hash="8c44b58eb6e2df3909bfe0c460a28e7d"/><file name="addphonenumber.phtml" hash="9d7f5b6f1c25b753c39b9d9a75bf8809"/><dir name="gomage_checkout"><file name="available.phtml" hash="6e763fd914f9da043793f526f7508b15"/><file name="deliveryoptions.phtml" hash="5777f05c189bf328ac13d47e5fbfcafa"/></dir><file name="js.phtml" hash="1090c61caf8925a6961ce55460246294"/><dir name="onepage"><file name="available.phtml" hash="100e509f0c2cb82e22de0735a4afc144"/><file name="deliveryoptions.phtml" hash="b5c8896b8c922f89b3124b94c102e9aa"/><file name="pickup_notification.phtml" hash="8a2262e00a82aac73f565fbf6ef160c3"/><dir name="progress"><file name="pakje_gemak.phtml" hash="07646cfd17ba8ddb1889ae0c01554440"/><file name="shipping_method.phtml" hash="cc7a33fa2411b444d1a23a053e313d66"/></dir></dir><dir name="onestepcheckout"><file name="available.phtml" hash="0b286aa4c191af9fe3c1cfda510aac71"/><dir name="bpost"><file name="available.phtml" hash="379d301a12d598d164b5afb0fac126b1"/></dir><file name="deliveryoptions.phtml" hash="f2fa039a3f099f41433c3ebe229e5f42"/></dir><file name="progress.phtml" hash="4e17a7cc24bda609244091b767817cf1"/><dir name="sales"><dir name="order"><file name="delivery_options_info.phtml" hash="263147e3762bbfd2cba230a2d7ec21b5"/></dir></dir><file name="theme.phtml" hash="ae93d3471327a0525388264af2575382"/></dir><dir name="mijnpakket"><file name="account_notification.phtml" hash="8579d5a7735de1831fa58f08e2f5579c"/><dir name="gomage_checkout"><file name="js.phtml" hash="1c57ff5b07a2c7123c5cc01a41e6853e"/><file name="login_button.phtml" hash="32962237f54619e75d098daaebbfab7f"/></dir><file name="js.phtml" hash="66014d70ce25f90fa651a33537335817"/><dir name="onepage"><file name="login_button.phtml" hash="3d4d1b47e88127f431042d30df1d3ef6"/></dir><dir name="onestepcheckout"><file name="login_button.phtml" hash="a5e7ca1d245a33fd262afe44449f7ac6"/></dir><file name="order_success_js.phtml" hash="165cf4aa0837bfb5c1034846e58bd17d"/></dir><dir name="payment"><dir name="checkout"><dir name="form"><file name="cod.phtml" hash="fa95f7e6494a4d0d8d988ad58f3b61f4"/></dir><dir name="total"><file name="cod_fee.phtml" hash="9273dca9058bc1e782ad6750be468d96"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="rwd"><dir name="default"><dir name="layout"><dir name="TIG"><file name="postnl.xml" hash="88bc2129c1be42f128e0b081712765ea"/></dir></dir><dir name="template"><dir name="TIG"><dir name="PostNL"><dir><dir name="address_validation"><dir name="checkout"><dir name="onepage"><file name="postcode_check.phtml" hash="db2c4471a2a72231e9e48846827d3af6"/></dir></dir><dir name="customer"><dir name="address"><file name="postcode_check.phtml" hash="9d52ad0c9e9879dbdd9a456bbc26c6b3"/></dir></dir></dir><dir name="checkout"><dir name="cart"><file name="link.phtml" hash="9421d86c9999726b5f4fbeb2bd444ae8"/></dir></dir><dir name="mijnpakket"><dir name="onepage"><file name="login_button.phtml" hash="bfaf1bf82634b1f23dcce616a905f017"/></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="TIG"><file name="postnl.xml" hash="1edaba7a5995edecaee7448cdbe0e97a"/></dir></dir><dir name="template"><dir name="TIG"><dir name="PostNL"><file name="cron_notification.phtml" hash="67bbd1d6737e958906d0378f4b246387"/><file name="integrity_notification.phtml" hash="f8bb74b367cd4c1d65b203571db5af70"/><file name="log_notification.phtml" hash="b823242d8db7e1f1ccfb603c653922f0"/><dir name="payment"><dir name="checkout"><dir name="form"><file name="cod.phtml" hash="145ff33fea020e3e3148c641c9b98bc6"/></dir></dir></dir><dir name="sales"><dir name="items"><dir name="column"><file name="qty.phtml" hash="ee6a8f8fa3515ae96daa5ab5931b50be"/></dir></dir><dir name="order"><dir name="address"><dir name="form"><file name="container.phtml" hash="c70f2fca642dd867f51c265f5bd24421"/></dir></dir><dir name="create"><file name="js.phtml" hash="45ece3a5af2b5b720158f6f9910ede7c"/><dir name="totals"><file name="cod_fee.phtml" hash="024424c5e3b8f23e8f424fa015ba23b6"/></dir></dir><dir name="creditmemo"><dir name="create"><dir name="totals"><file name="cod_fee.phtml" hash="a35bb3ed9e43e09a5c966c3621566cd9"/></dir></dir></dir><file name="filter_massaction.phtml" hash="5767fd53a9eed4d361332dddd97a12ac"/><file name="js.phtml" hash="18ec1303ae3a85e40107c070c7547461"/><file name="product_options.phtml" hash="fac95293486e5a81d5981b3b717aaa4a"/><dir name="shipment"><dir name="create"><file name="shipment_options.phtml" hash="786fd238ba19dc471b5df422215a5927"/></dir><file name="filter_massaction.phtml" hash="d4e0379e6a96a5fd92ace380715549b9"/><dir name="view"><file name="delivery_options.phtml" hash="dad28852823476f3d7a80a1d94371f3e"/><file name="pakje_gemak_address.phtml" hash="d9dbf8a4ae4d2c3efccf8696d64b580a"/><file name="shipping_status.phtml" hash="2f7b0378604f69b0da2a4a2b7a642b72"/><dir name="tab"><file name="status_history.phtml" hash="2ffe0b40dea1e06af41498702a066cea"/></dir></dir><file name="view.phtml" hash="00087383abc14dd8400ba17e3aeda003"/></dir><dir name="totals"><file name="tax.phtml" hash="ab09fbdc3a7673ca587d8c6de4c02ffd"/></dir><dir name="view"><file name="delivery_options.phtml" hash="e3bc1515159593c8a5f5545db2ae0789"/><file name="pakje_gemak_address.phtml" hash="dc87c6cfce56eb69ea5e2a86d522212c"/></dir><file name="windows_theme.phtml" hash="55103508fe6bb75628ef0c5901c08666"/></dir><dir name="shipment"><file name="customize_link.phtml" hash="efe9c3208669fe44b15725f86ce22c63"/><file name="js.phtml" hash="ab44d94f816af3eb1f59ca4044d79214"/><file name="testmode_warning.phtml" hash="def163c3796aae431b07351f03cd6ed0"/></dir></dir><dir name="system"><dir name="config"><file name="edit.phtml" hash="4f073927211c81a65263953cfbe87170"/><dir name="form"><dir name="field"><file name="array.phtml" hash="6bb1f404b24129b198c9c95a28c1bd66"/><file name="config_check.phtml" hash="cf8ab0445473583fcdcc997e30d58164"/><file name="field_header.phtml" hash="5ca62f4d7b2b0817e3416a4c6089e145"/><file name="info_box.phtml" hash="f387052ae039703f04a76ae255aa2508"/><file name="js.phtml" hash="35d5521c921b474e40373e5c7e30c45c"/><file name="split_address_check.phtml" hash="f23ca53d46419f7438fbd1c5ba164f2e"/><file name="support_tab.phtml" hash="308a0962fc31abfe09c6b5a03aabed14"/><file name="warning_box.phtml" hash="9841c9270a4ec7049ee6a46cc6bcb6e3"/></dir></dir></dir></dir><file name="upgrade_notification.phtml" hash="9e9f1a1331b432c56889cfa4df06f8a7"/><dir name="widget"><dir name="grid"><dir name="massaction"><file name="label_start_pos.phtml" hash="244c60efd2281a12206987dca2f5a73c"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="TIG_PostNL.xml" hash="bc88adf886505eac7c8fd420b5a775a2"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="TIG"><dir name="PostNL"><file name="cart.css" hash="d51ab6c200da5c54eb8e672c9325dbf5"/><file name="default.css" hash="46f2e8f1748e604457cc1b237a0950f5"/><dir name="deliveryoptions"><file name="default.css" hash="e82b48626cd9640e6130e84dcb22a186"/><file name="gomage_checkout.css" hash="5a06cdff83cf7129aefe4bd4614c07b0"/><file name="gomage_checkout_mediaqueries.css" hash="1059ae216e39968ce3122e1485ee0458"/><file name="gomage_checkout_neutral.css" hash="cb2cc910a3e96ed3fc9b23d20a6f34eb"/><file name="ie8.css" hash="1f0e04ca6c7be6572defb3adadafd28a"/><file name="mediaqueries.css" hash="3e8b87e8f0f30cbbe83686fa59bfd482"/><file name="neutral.css" hash="4b3b09545e3395f302e1efd487bf2739"/><file name="onestepcheckout.css" hash="fd7d786cc66c34b81555111e34c062eb"/><file name="onestepcheckout_mediaqueries.css" hash="2eb1086de2c12f7b728794fdf5ae431c"/><file name="onestepcheckout_neutral.css" hash="cb2cc910a3e96ed3fc9b23d20a6f34eb"/></dir><file name="messages.css" hash="19d03101c862b45535bc08344c12716a"/><file name="mijnpakket.css" hash="609c7c1218890f38bb9c4732ee5a0e2c"/><file name="postcodecheck.css" hash="af2e0297ed311d11b7bff818ec7b6d61"/><file name="returns.css" hash="23a6cb90aa662d2f866459e8ddf9a38a"/><file name="shipping_status.css" hash="fcb3fe311d50ee93176dc29ef2d5a0b9"/></dir></dir></dir><dir name="images"><dir name="TIG"><dir name="PostNL"><file name="bkg_progress_small.png" hash="fc6c9f28b6a6aae6f0096d504c0952df"/><file name="bkg_tooltip.png" hash="56cfed3ed8a65b19f8de88946d1a0a01"/><dir name="deliveryoptions"><file name="bkg_add-location.png" hash="a30d4aea73b094df5f434f9856dc626b"/><file name="bkg_add-phonenumber_input.gif" hash="25fa933b55e69a552f7d1cf704a8d6f9"/><file name="bkg_back_link.png" hash="b7bd79383aa89243980329e07b55a300"/><file name="bkg_btn-close.png" hash="5438c768cd63b2476cf14418acb28709"/><file name="bkg_button.png" hash="a1bf9f994f90033e143b7e2023c0e4fb"/><file name="bkg_checkbox.png" hash="71628b28d876482b600755e577132fee"/><file name="bkg_extras.gif" hash="6b374d9759f894962259eb995a3d59f9"/><file name="bkg_info_link.png" hash="0bf3dd9b4d23c7da406fa81ccb38799e"/><file name="bkg_location-search_input.gif" hash="fcee91af0d97e50fcf698eb7485327a8"/><file name="bkg_location-selected.png" hash="efe72719a889f94f4aa24e6f6d6db8df"/><file name="bkg_location.gif" hash="937e1a367cafdcc0d4f62afb572879a1"/><file name="bkg_more-info.png" hash="3681dc9b54011dae7c81d6c4b2e74a2b"/><file name="bkg_option.gif" hash="a3b9a292d28540147bfb034060731cb3"/><file name="bkg_phonenumber_failed.png" hash="8d1a0503bfe7cdfc2e35365bba2a8f7d"/><file name="bkg_phonenumber_verify.png" hash="28f90e0364778463144004ff289d70a7"/><file name="bkg_postnl-logo.png" hash="a34b5d938234a7360e5566df9fb4273f"/><file name="bkg_postnl.png" hash="46c5f6c65f66da09b39496c7cef94e89"/><file name="bkg_radio.png" hash="3cc3ecb77e5ce62511385d59e037b398"/><file name="bkg_rwd_rate-line.png" hash="d7cc800714e0372f2bc991bc50a99ca2"/><file name="bkg_tooltip.png" hash="cbd753cc9cb873468d1bba07e70f0d2f"/><file name="bkg_tooltip_close.png" hash="6b568d6430e21e974f360f4961db9102"/><file name="ie8_bkg_transparent-white.png" hash="a603671f51cb11ed9370bcd3181741c7"/><file name="loader_default.gif" hash="9fec99d885ad6bc45aee40d1c171ca4b"/><file name="loader_mini.gif" hash="f244ab6581d4329e3dbb7e289d47dfb2"/><dir name="locations"><file name="crc_albertheijn.png" hash="57af250f9d59b9074132446e0109ee93"/><file name="crc_automaat.png" hash="e9e94287380f27f6752d89f995b1b7f4"/><file name="crc_bruna.png" hash="326912294c49e8c896a34a28a7c03127"/><file name="crc_c1000.png" hash="8628f2e6328805a84e8eac28511b6857"/><file name="crc_coop.png" hash="0250717148ab776d156371a3e0912b9e"/><file name="crc_default.png" hash="777edf1aa124f6cb13258bb510db809b"/><file name="crc_emte.png" hash="ba7841f22a08d379f1ddabbe708ffa41"/><file name="crc_gamma.png" hash="6dc0ff8b36892af40ce80a36355d311a"/><file name="crc_jumbo.png" hash="061ae156e55e3aee6130cd1beb8d1b9a"/><file name="crc_karwei.png" hash="a7b8ee695b996cb757fd5c1a98e888e4"/><file name="crc_plus.png" hash="e67e871870c87723d835db23af18d4e9"/><file name="crc_primera.png" hash="e367c1e5b3fb4e25303aff57dc1a1259"/><file name="crc_readshop.png" hash="eeef9a98c0cd68f4351154d174bfdda9"/><file name="crc_spar.png" hash="4939d469045e6c7d7e65f172d97e30b1"/><file name="crc_staples.png" hash="94136b2a8d00dfdadcad6c7088920409"/><file name="drp_albertheijn.png" hash="944b90f36d5f225fcc74d360d368e628"/><file name="drp_automaat.png" hash="ce0bd13abc5e6c647c2ac8bc0fb5c150"/><file name="drp_bruna.png" hash="feb3ea92e3d32e98edf04aa22604afe6"/><file name="drp_c1000.png" hash="9e89a865b72d182135226fc72a98e03a"/><file name="drp_coop.png" hash="ddd34926b0a306cb0b28f385a78bd972"/><file name="drp_default.png" hash="d97f2e415e54b5d9fa19893210cedbc0"/><file name="drp_emte.png" hash="34e526c095a080cf92ccf15318a56ba3"/><file name="drp_gamma.png" hash="56da28b8c2e0ad6087eb0c4408f9904c"/><file name="drp_jumbo.png" hash="f191ec9c01b807d32811d9a4f0c3ad19"/><file name="drp_karwei.png" hash="d3da2d8b7f65ddecdf13091094a8fbea"/><file name="drp_plus.png" hash="9bf96ded99d0e47b34256cdc78310754"/><file name="drp_primera.png" hash="095b1ced03087b390b96ee3d525dce7e"/><file name="drp_readshop.png" hash="d2884c0bdd81103e9319469727bc9855"/><file name="drp_spar.png" hash="9ff6bb1fc489ba714d3249c35fb01c77"/><file name="drp_staples.png" hash="2196de7813fa6db34f8b0abb1aedecd5"/><file name="tmb_albertheijn.png" hash="58ae464ff7bb420f075e53cd35d9852f"/><file name="tmb_bruna.png" hash="ff523c258b47be502b335a7e8cc5032c"/><file name="tmb_c1000.png" hash="f96136426d2a2af40ef7b76953ec58b5"/><file name="tmb_coop.png" hash="b1e41c613b1876c787e9d4d5b30ba1a5"/><file name="tmb_default.png" hash="ed65f2da1032b355422db7c86a126668"/><file name="tmb_emte.png" hash="d0e9dc8f785b8db0da8bd233a0d09a11"/><file name="tmb_gamma.png" hash="55ef36ad8aa803469e28f368b7eac536"/><file name="tmb_jumbo.png" hash="3bae16290854122b2b3439de2402c5a1"/><file name="tmb_karwei.png" hash="84e1aaceb9c0ff3864b2b7aead52e033"/><file name="tmb_plus.png" hash="fd3bf32ffb591f79935bb906249ca59e"/><file name="tmb_primera.png" hash="fb32942772b4ca57a45ee0e08406c3bc"/><file name="tmb_readshop.png" hash="6a6826139698fa20e0fd4210d17b50e2"/><file name="tmb_spar.png" hash="89694e10f073619fd944d8c2c7b9e357"/><file name="tmb_staples.png" hash="115af373105f6494c74186657ddca6a6"/></dir><file name="osc_bkg_postnl-logo.png" hash="c23e987598dcd439e54f9d48e9e4777a"/><dir name="unbranded"><file name="bkg_back_link.png" hash="5797c608687a704a935b0ff03b8d3982"/><file name="bkg_checkbox.png" hash="232ad0ec83b32af770481bb1cdd1520e"/><file name="bkg_more-info.png" hash="96a0b80b2907a28489d8d87f845d8a5f"/><file name="bkg_radio.png" hash="430bea179fc0e6570c1cca905b46454e"/><file name="bkg_tooltip_close.png" hash="eac7d71f0cb14f165b6f7af55a6c4c26"/><file name="button_action.png" hash="c297cbc6aa5c44272308b660038b363f"/><file name="button_next.png" hash="768365d31d95bb5c8b1ccebb62920a95"/><file name="loader_default.gif" hash="1645395ddefeab89f51f59b2dbcbd7c0"/><file name="loader_mini.gif" hash="2fd11016727f350b98af17fc76b3a0d3"/></dir></dir><file name="icon-tooltip.png" hash="5767601cd66b23d0b6fe8defc10dd48d"/><dir name="mijnpakket"><file name="app_buttons.png" hash="74f3a4d80dafe1a0979ce7ad0bd70824"/><file name="app_logo.png" hash="e5426bac3d0b4e28ef1f3628503c2365"/><file name="logo.png" hash="6fa95b3a5e83b6887848b5feb7369bf1"/><file name="logo_small.png" hash="c23e987598dcd439e54f9d48e9e4777a"/></dir><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/><file name="overlay.png" hash="f08feb852288bea420ba3af68ae34a1f"/><file name="postnl_email_logo.png" hash="8bd358b514e04e7ceca03efb38f8fded"/><file name="postnl_spinner.gif" hash="cef321b68ab934932ee317986823db67"/></dir></dir></dir><dir name="js"><dir name="TIG"><dir name="PostNL"><file name="ajax.js" hash="ac8120be1ff0e421e80b14ad2617d4c1"/><file name="checkout.js" hash="e64437f55f7ccafb205a1d6f55995537"/><file name="deliveryOptions.js" hash="944cebd17c363a69dd2daf58dd1fbe44"/><dir name="deliveryoptions"><file name="cufon-fonts.js" hash="7605bb17619f1a55e3521a700dfe7b1a"/><file name="cufon-settings.js" hash="9bb0303049c178db309438c26f7def2c"/><file name="cufon-yui.js" hash="2d0f7f2a050cc1a9c9456d97d29f5eda"/></dir><file name="formPopulate.js" hash="668076474b61c5295f82726a3235451a"/><dir name="gomage_checkout"><file name="mijnpakketLogin.js" hash="dcc34351b834646e41a88f5d6a9e6dea"/></dir><file name="livepipe.js" hash="b9f5e38a94ce3f4f6f6ebcabca23d8c3"/><file name="mijnpakketLogin.js" hash="b7a4c400044ba8e9aefd706c0193f778"/><file name="placeholder.min.js" hash="c2824272a822d3fb8429a239e7d20c24"/><file name="postcodecheck.js" hash="864882d849033b308b29181dea7ce09c"/><file name="scrollbar.js" hash="b6780bb325e0ac78bc37e7b9d1bac863"/><file name="slider.js" hash="1679e9ff9a8d3784387040fc7cef9203"/></dir></dir></dir></dir></dir><dir name="rwd"><dir name="default"><dir name="css"><dir name="TIG"><dir name="PostNL"><file name="rwd.css" hash="4d14fe3ff05c4bf41a5161b113b15767"/><file name="rwd_osc.css" hash="d3b7cc449980f3dba097db6127a45f0c"/></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="css"><dir name="TIG"><dir name="PostNL"><file name="shipping_status.css" hash="d70f88078aa443807d249b3bf51320bf"/><file name="styles.css" hash="99c3298ef947a3e2d4a8aec7c88248cd"/><file name="system_config_edit.css" hash="103eaeae2d9e2a4a43b48a83ea7f2dad"/><file name="system_config_edit_postnl.css" hash="d25851e44a1d5c9beff046c2c0450ad0"/><file name="system_config_edit_postnl_magento16.css" hash="f9a8479639e2fe8d0da9cf602b1607c3"/></dir></dir></dir><dir name="images"><dir name="TIG"><dir name="PostNL"><file name="bkg_progress_grey.png" hash="8d4d5144292b98a23475367ede717b17"/><file name="bkg_progress_grey_begin.png" hash="6815c9264e78f8f9d2805c595f8800c4"/><file name="bkg_progress_grey_end.png" hash="dae90fdb38adf65e6ccc209b6a80372c"/><file name="bkg_progress_grey_seperator.png" hash="10178e12fd14fb783b4ae0fbd55a4a81"/><file name="bkg_progress_orange.png" hash="8a59f76e36ee0492f5341b8e5e7ee79b"/><file name="bkg_progress_orange_begin.png" hash="ecc84d5252e397f4a783ee7e0c426d63"/><file name="bkg_progress_orange_end.png" hash="d0a81dfea1a3eddc699482a62af01fc9"/><file name="bkg_progress_orange_grey_seperator.png" hash="ab558953ec4c40ef44653ab481084345"/><file name="bkg_progress_orange_seperator.png" hash="a774eb89763d95f2e60d03f8702fba86"/><file name="bkg_progress_sprite.png" hash="3230379a4544f85062a6ba91fa8083e2"/><file name="bkg_progress_sprite_reverse.png" hash="c27c9ac49dd3c82f6351307d7b63f36a"/><file name="bkg_tooltip.png" hash="56cfed3ed8a65b19f8de88946d1a0a01"/><file name="btn_download_icon.png" hash="142d5ebbe43ad09dde97cd32e1ef4303"/><file name="glyph_error.gif" hash="a138b803d772f552aa2e49e1c506edbd"/><file name="glyph_go.png" hash="343996189e35c6685b90993b43059ecd"/><file name="glyph_info.gif" hash="40f72d28be63ecf2b6ef44c7ea730104"/><file name="glyph_manual.png" hash="771db63b6ffc9de1c06da564796adc6e"/><file name="glyph_pdf.png" hash="a5ea929f4014a88d7320d0293913ace3"/><file name="glyph_success.gif" hash="465a056a3ba3d94367f51c3c0b751391"/><file name="glyph_warning.gif" hash="fa817cb6d49efb9855942ef2b739fc6c"/><file name="icon-tooltip.png" hash="5767601cd66b23d0b6fe8defc10dd48d"/><file name="legend.gif" hash="d8fb0642901868d489d31b426f3e3406"/><file name="loader_default.gif" hash="9fec99d885ad6bc45aee40d1c171ca4b"/><file name="logo_postnl.png" hash="10b9ae4ad2c5365312c257dcdac1fc64"/><file name="tig_logo_medium.gif" hash="3e1071908cfdb7b472438482c3331ac7"/></dir></dir></dir><dir name="js"><dir name="TIG"><dir name="PostNL"><file name="configuration.js" hash="6ca6c63dddc579f825ae0a3214a7d59d"/><file name="form.js" hash="4586e90d9f3a1c96531fc9f19c0901d0"/><file name="mass_action_filter.js" hash="7005d1ecd9a6c1e16d14a2aa3cb0b11c"/><file name="validate.js" hash="84a9bc86137c3d2dd488eee8bd2e3fc9"/></dir></dir></dir></dir></dir></dir></target><target name="magelib"><dir name="TIG"><dir name="PostNL"><dir name="Fpdf"><dir name="font"><file name="courier.php" hash="ca6fb483549604fb4a675f9e28a73b02"/><file name="courierb.php" hash="a58d7dadf3cf564ca5d5138cea76a3a9"/><file name="courierbi.php" hash="c0e416771dc56cb2397390978d112dc2"/><file name="courieri.php" hash="419961dbeeb20f08da780dccb427dec8"/><file name="helvetica.php" hash="fc53162b924ddd522bd6cfe86fab48f4"/><file name="helveticab.php" hash="4e9ffda682a131fef2e04ccd94aa342d"/><file name="helveticabi.php" hash="6db8943bd91bf13514b82872cf160d45"/><file name="helveticai.php" hash="13b795df0c33eb93c48621792f2ea12d"/><file name="symbol.php" hash="fbd9250c21af99f6398d6f817511f91f"/><file name="times.php" hash="82bc100f1f3bd8b2d9b7fb5ee8f44b3a"/><file name="timesb.php" hash="3a241a1658bf9ea2062e63f464166c31"/><file name="timesbi.php" hash="bfdd0235a71793becefff778c2b16243"/><file name="timesi.php" hash="17fd69f176915a2113fe28057b43a75e"/><file name="zapfdingbats.php" hash="2848ab2daf3128f310b5cf713ca4acee"/></dir><file name="fpdf.css" hash="84befac49464a9aac54aa511bc1fd754"/><file name="fpdf.php" hash="4ebda2283504bfd34b85753433d7e098"/><file name="helvetica.php" hash="fc53162b924ddd522bd6cfe86fab48f4"/><file name="license.txt" hash="fb784726cfe3615da38bc23a3cac445b"/></dir><file name="Fpdf.php" hash="b98f822c8de60fd72c82bd15c92c5a9a"/><dir name="Fpdi"><dir name="filters"><file name="FilterASCII85.php" hash="c6b756ac5874cc6f6f986349b605af64"/><file name="FilterASCII85_FPDI.php" hash="1240e0c64602864401f886546e09fe7b"/><file name="FilterLZW.php" hash="fcba53a4dd3a1f78e62c7aeac726c7b5"/><file name="FilterLZW_FPDI.php" hash="b11c50e66e20744ad20f176cae4af284"/></dir><file name="fpdf_tpl.php" hash="3966b13c398c94509e2fb6199593b104"/><file name="fpdi.php" hash="abb524d17a2cbdd3c3b7e89184aad443"/><file name="fpdi2tcpdf_bridge.php" hash="bcc317cbcfdd3faeae4a1eb480bded0f"/><file name="fpdi_pdf_parser.php" hash="d7a3bf0153ae9ad57976afb0be5d195d"/><file name="pdf_context.php" hash="0b69a25dbb830f3b68c054c2e43b876e"/><file name="pdf_parser.php" hash="5ff22a8c1ce5b1eee82c8017311a797e"/></dir><file name="Fpdi.php" hash="10e45da64b0e05274dc183680fc41988"/></dir></dir></target><target name="magelocale"><dir name="en_US"><dir name="template"><dir name="email"><dir name="TIG"><dir name="PostNL"><file name="return_label.html" hash="dd2ad306d092b7dd481a0a972733f8bb"/><file name="track_and_trace.html" hash="b77871334fc82d5811954024b3f8058d"/></dir></dir></dir></dir><file name="TIG_PostNL.csv" hash="355da28851927049d65a4dab3d51b515"/></dir><dir name="nl_NL"><dir name="template"><dir name="email"><dir name="TIG"><dir name="PostNL"><file name="return_label.html" hash="cd54d668b8e1958cb50aa7abf1bc280b"/><file name="track_and_trace.html" hash="35b9b68a9c0232fe4e5ea43b138f580e"/></dir></dir></dir></dir><file name="TIG_PostNL.csv" hash="31dbf339acd01a3016aed9e95d17478b"/></dir></target><target name="magecommunity"><dir name="TIG"><dir name="PostNL"><dir name="Block"><dir name="AddressValidation"><dir name="GoMage"><dir name="LightCheckout"><file name="Billing.php" hash="9e4dd285bcccdc2c09a98703df8aba8b"/><file name="Shipping.php" hash="f31e5927754e233953f5ee63e3b79fa0"/></dir></dir></dir><dir name="Adminhtml"><dir name="Carrier"><dir name="Postnl"><dir name="Matrixrate"><file name="Grid.php" hash="719cae84112c3c136655489c3491f8d4"/></dir><dir name="Tablerate"><file name="Grid.php" hash="d4047c8f409212e53ad26edd32bf1f80"/></dir></dir></dir><file name="CronNotification.php" hash="8cee9172939b14a2ccea91f848e77a98"/><file name="IntegrityNotification.php" hash="e6975cdea227b1bc901b4a8b6713bd7c"/><file name="LogNotification.php" hash="924dd0bc38a4a9f09294983cce277efa"/><dir name="Sales"><dir name="Items"><dir name="Column"><file name="Qty.php" hash="053e31cba3678520d680772658580f29"/></dir></dir><dir name="Order"><dir name="Create"><dir name="Totals"><file name="CodFee.php" hash="0911e98f34deef84a130b75c6cee2d51"/></dir></dir><dir name="Creditmemo"><dir name="Create"><file name="CodFee.php" hash="465960a4fd4fe538f8933f6571bdea77"/></dir><dir name="Totals"><file name="CodFee.php" hash="464b958112dec88a08daf3c2f72fdc28"/></dir></dir><dir name="Invoice"><dir name="Totals"><file name="CodFee.php" hash="f92fd67e68d2cc83f3352272365f3ca9"/></dir></dir><file name="ProductOptions.php" hash="50183056ec5ea51bcad55333f65ae32b"/><dir name="Shipment"><dir name="Create"><file name="ShipmentOptions.php" hash="d9ba85b04953b426560a2525770c5f4a"/></dir><dir name="View"><file name="DeliveryOptions.php" hash="ad21b51e6aa002548b69ed33eb36a345"/><file name="ShippingStatus.php" hash="fce062abeff245502b4b1aa438e36e7d"/><dir name="Tab"><file name="StatusHistory.php" hash="47dc64f36b6d0b35acb566ef95f31a5e"/></dir><file name="Tabs.php" hash="7348554a20e28170a8d4a3d16901cb1e"/></dir></dir><dir name="Totals"><file name="CodFee.php" hash="36e884e30294dafaf7cf51d6708e33ee"/></dir><dir name="View"><file name="DeliveryOptions.php" hash="073485c298d79d2f61f60113a95b9767"/></dir></dir><dir name="Returns"><file name="Grid.php" hash="b8f2c760a91d60ee8f64be58a5482a8c"/></dir><file name="Returns.php" hash="8ddbe0855ea557f1f00236fc88c05aae"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="ActivateButton.php" hash="7accd8c5dece4046b3071250bb976611"/><file name="ActivatedFieldHeader.php" hash="e616a200961dada2718e427b2ff64d39"/><file name="AddressLines.php" hash="cf78339932dfcdfe00cac15f3d8a4d9c"/><file name="Anchor.php" hash="5a20dca71190d8a273425474691c43c1"/><file name="Checkbox.php" hash="124a56f6a5047be8c034fef881c17d03"/><file name="ConfigCheck.php" hash="90cff6426c543dc3d4b0148282754a7a"/><file name="GoMageDeliveryDateConflicts.php" hash="db7d30303c9b5bc38455e61f4cd084c6"/><file name="Hidden.php" hash="4ddc832e13d9d77a7c5f4a3d7128e2cc"/><file name="HourMinute.php" hash="4ebd99406f97313083391348c836098e"/><file name="InfoBox.php" hash="1edb3b7e27ca9655c239852a3a66ae0b"/><file name="MatrixrateExport.php" hash="92a313da8a920266b3f8a1224e1ddd73"/><file name="MatrixrateImport.php" hash="9aaa4ffccfadde72e1a2df9b47a49671"/><file name="Obscure.php" hash="c4ca2e1e738116be5877582212a024f3"/><file name="PackingSlipItemColumns.php" hash="6ac4aed9b10fef8e42150b51df447964"/><file name="PostcodeNlExtensionActive.php" hash="6a84e450066a4b065dd4eecdef8d8df9"/><file name="Radios.php" hash="57fe1ef1a58b5702e49b891ad02ae3fc"/><file name="SplitAddressCheck.php" hash="18b4ac122fdbb436c124e7be5453eddd"/><file name="SupportTab.php" hash="edec65cf3bd2c0e7ec6f472ac6cf104e"/><file name="TablerateExport.php" hash="f9422e88ae49d20e22b52d303ccc4bf8"/><file name="TablerateImport.php" hash="8ef2c6b824a8980f7f8c2b3867c048bf"/><dir name="TextBox"><file name="Abstract.php" hash="79a86dc5182b44267fdf289e0afcc50f"/></dir><dir name="Tooltip"><file name="HourMinute.php" hash="49afc832ba943ae68721287a0cec17d9"/></dir><file name="UninstallButton.php" hash="7e793a5bea3ca2757fa924a070059a76"/><file name="ValidateButton.php" hash="2e807c355c09975ebdcecc95b3122051"/><file name="WarningBox.php" hash="d10d2b6ac7a48fd2b23e098c4e42a1e5"/><file name="WizardSaveButton.php" hash="c3092c8e2ec3217b0e2c64759052a913"/></dir><file name="Fieldset.php" hash="60e2cde58df3bf31c512d3cddecbd7b8"/></dir><file name="Form.php" hash="faea4d8963a40e906fa0e2f75d471999"/><file name="Js.php" hash="fef042173a890a417b379980b04af865"/></dir></dir><file name="Template.php" hash="698d5aba71928360810108ca499f5d46"/><file name="UpgradeNotification.php" hash="3c345025f1dc2baf1c2703339adedee4"/><dir name="Widget"><dir name="Form"><dir name="Element"><file name="Dependence.php" hash="0fa5334c0d152c8500270c11f833548a"/></dir></dir><dir name="Grid"><dir name="Column"><dir name="Filter"><file name="ConfirmDate.php" hash="de9c6cd4eb3b442631538e4760f9be49"/></dir><dir name="Renderer"><file name="Action.php" hash="f9c22f49ccffb03c7a7638af26beb162"/><file name="Barcode.php" hash="2e87137f14a4c9ed6f0352b76c0cec68"/><file name="ConfirmDate.php" hash="bf90b423d7704b85efb8cfcd078308ef"/><file name="ConfirmStatus.php" hash="76c2c59218a7d970aff1db1645c34173"/><file name="CountryArray.php" hash="e49b3b0de079392f59a3676879cffc72"/><file name="DeliveryDate.php" hash="4050c877c64a6a24ac0a4267fecdcf84"/><file name="OrderConfirmDate.php" hash="1395566110233ede6fb8029710e81cb3"/><file name="OrderConfirmStatus.php" hash="baff31b5b2187eb4f45261f6dc2dd98b"/><file name="OrderType.php" hash="b7af6183f916458253db6c714f5ac705"/><file name="ReturnView.php" hash="d95b0b8413c714ebad57773e4f352cbe"/><file name="ShipmentType.php" hash="2589ca78f7f5e4a6a5ca17332c65b646"/><file name="ShippingDescription.php" hash="ccfc24586ed0a5d050173cb7f807f4c7"/><file name="ShippingPhase.php" hash="17bea1345fbad0c6fc0dd0ee8aa9ae42"/><file name="Time.php" hash="380060629ddf255f88f6c7df8532ab8f"/><file name="Translate.php" hash="71a7a828f7c150d03e06be8da97ce0c5"/><dir name="Type"><file name="Abstract.php" hash="91c423dff8145717fbe85c66af6e5276"/></dir><file name="YesNo.php" hash="0363dd1204d921d715abff853cf38018"/></dir></dir><dir name="Massaction"><dir name="Item"><dir name="Additional"><file name="LabelStartPos.php" hash="e4f5e368259942adb21b1d9acd241bbf"/><file name="ProductOptions.php" hash="5fb0ac3b749d121d48a90d8b443bc628"/></dir></dir></dir></dir></dir><file name="WindowsTheme.php" hash="32aa198b04a15db89e2d85e8fdb366a5"/></dir><dir name="Checkout"><dir name="Cart"><file name="CheckoutLink.php" hash="95962909faf4ceda468c590dd739d12d"/><file name="Js.php" hash="ae3f3270dbfbe73c7b62e22d289fecc4"/></dir><file name="Summary.php" hash="f29a603b634270c755d9fbb51285bb26"/></dir><dir name="Core"><file name="JsTranslate.php" hash="e5e5c1e1945dde3289e558019afcbf9f"/><dir name="Order"><dir name="Returns"><file name="Info.php" hash="8890bc0b803aa27e0390eb0e5bd04f93"/><dir name="Shipment"><file name="Items.php" hash="227aed060faaa753c8bbac4b4b7ef104"/></dir></dir></dir><file name="ShippingStatus.php" hash="00807b7434dadcb81577a0ec9e406f1f"/><file name="Template.php" hash="9fd7d22e913b32c7c79d3f2353714765"/></dir><dir name="DeliveryOptions"><dir name="Checkout"><file name="AddPhoneNumber.php" hash="487d5e0279d440ecb6872712c7bf0bf6"/><file name="DeliveryOptions.php" hash="89ba6fa793144638b581a919676e4a41"/><dir name="GoMage"><dir name="LightCheckout"><file name="DeliveryOptions.php" hash="33bc90994ed38e73c893702bf2983cd0"/></dir></dir><file name="Progress.php" hash="ee6b2a989f34c1fbd2888f454e46bd6f"/></dir><file name="Js.php" hash="6986eace90ea7438b0ee7a5dc9062268"/><file name="PickupNotification.php" hash="517caea38f64e87659db08bd33c23b8f"/><file name="Template.php" hash="4a6119be5cde91551052685e59cac196"/><file name="Theme.php" hash="079727a91336d7ee1730daf2187c5a6b"/></dir><dir name="Mijnpakket"><file name="AccountNotification.php" hash="07165d887a985850fbc5b7feaf153d64"/><file name="Js.php" hash="325d49fd161c9b2f6d2aed7b8e26a226"/><file name="LoginButton.php" hash="9b0cb9bbe39943c9a697ba48cbcca03e"/><file name="OrderSuccessJs.php" hash="6184a29c169e32ea435d29179a6a0a61"/></dir><dir name="Payment"><dir name="Checkout"><dir name="Total"><file name="CodFee.php" hash="58c8b076ab42f123dfdd1d62f87a880a"/></dir></dir><dir name="Form"><file name="Cod.php" hash="8830e5ca6c5141f36e5b043e2af8e130"/></dir><file name="Info.php" hash="9c8a8e8eb81459220bf8730f1a01a5ee"/><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><dir name="Totals"><file name="CodFee.php" hash="45dba926b63c26ea2d10eaa9342fa126"/></dir></dir><dir name="Invoice"><dir name="Totals"><file name="CodFee.php" hash="15b6052badbd7cddab9bbf0cf3f28385"/></dir></dir><dir name="Totals"><file name="CodFee.php" hash="60305f5d74bc7a5f70919b0810f5db83"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="AddressValidationController.php" hash="f0cbb3c5eb7a06a7df87b46f12340f7e"/><file name="CheckoutController.php" hash="3cf67af615d9248e3a4c36b3a81aac0f"/><file name="DeliveryOptionsController.php" hash="bba6d64f24f3868bbe395825def69f4c"/><file name="GuestController.php" hash="b1fd41520eb6233ea8a592f3ad7f8960"/><file name="MijnpakketController.php" hash="cb21ac1e4a9bd9add17c726e8a4fc8c5"/><file name="OrderController.php" hash="169571ea271e3e8627417cd424265b6f"/><dir name="PostnlAdminhtml"><file name="ConfigController.php" hash="4be0a654b3587c85cfa407a2efdf7ac3"/><file name="ExtensionControlController.php" hash="8b53f7625d0d785012d583431df9b05e"/><file name="ReturnsController.php" hash="8970672c07d50c0db41d9ead77f85685"/><file name="ShipmentController.php" hash="555f97328eb9e3ca55d77f609773aab3"/></dir></dir><dir name="data"><dir name="postnl_setup"><file name="data-install-1.0.0.php" hash="0f6e51ffdb05c34ee375caa6ed04330a"/><file name="data-install-1.0.3.php" hash="e810f0490e9addecdff1e147038505cf"/><file name="data-install-1.1.4.php" hash="679d2f5045221c9e4a5739ceea6aea5d"/><file name="data-install-1.3.0.php" hash="acb1dba6ea2f9d20fab54f4da8d01b1d"/><file name="data-install-1.4.0.php" hash="aa25ceff90a870a56f91b1e1e1535748"/><file name="data-install-1.4.1.php" hash="aa25ceff90a870a56f91b1e1e1535748"/><file name="data-install-1.5.0.php" hash="f6b92b1e6580b4d27ae59bdaa266f12b"/><file name="data-install-1.5.2.php" hash="f6b92b1e6580b4d27ae59bdaa266f12b"/><file name="data-install-1.7.0.php" hash="f6b92b1e6580b4d27ae59bdaa266f12b"/><file name="data-uninstall-1.5.2.php" hash="936bca5a4d83453ba084eae9222063fd"/><file name="data-upgrade-1.1.5-1.2.0.php" hash="d42917000f883909039da268d072f12e"/><file name="data-upgrade-1.2.2-1.3.0.php" hash="081f4fe0da30d8d1f17243044788d891"/><file name="data-upgrade-1.2.2-1.4.0.php" hash="ca609ef0963d214fdc73c2c683b6338d"/><file name="data-upgrade-1.3.1-1.4.0.php" hash="3adec6e1e180139c8736c0e38e3d64d0"/><file name="data-upgrade-1.4.0-1.4.1.php" hash="cc24dfba809a3258814cf736ace125c7"/><file name="data-upgrade-1.4.1-1.5.0.php" hash="07add30edfd0134bc5a1c9c3cc714463"/><file name="data-upgrade-1.5.1-1.5.2.php" hash="0a1c7ca7b337f718b2c94ffe6fd9e31d"/><file name="data-upgrade-1.6.0-1.6.1.php" hash="e7703a1946197f942e18d580315e1271"/><file name="data-upgrade-1.6.1-1.7.0.php" hash="4e77adb10d70f54ae7f2e38d4abcfe7a"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="56189634cdb92603e2b7c1bb7992b9f2"/><file name="api.xml" hash="06c70ddaedf5f1d80e5f00fed36861b9"/><file name="config.xml" hash="7eaeaf26a21f9e89cfdb570a84de0a54"/><file name="jstranslator.xml" hash="a59acc314517af3f6b3b3db8d5d7f833"/><file name="logging.xml" hash="04c82fc7390fe3a2547834f6e52b6777"/><file name="system.xml" hash="3e792c7a4ed0ee61912e113b2742783a"/><file name="wsdl.xml" hash="21b79f48351ea629cff7d17c8f65c4ee"/><file name="wsi.xml" hash="ac2aada1c17a03519e02fa7ef93e49ca"/></dir><dir name="Helper"><file name="AddressValidation.php" hash="ba4945afa4f4dc1c33e7efdf87b74fe6"/><file name="Adminhtml.php" hash="948ab2c69eaf1097a52c2a9d5ab44852"/><file name="Carrier.php" hash="a66a1eec4bcb467ba96da214c70acf4c"/><file name="Checkout.php" hash="d4d9c0ad29b2196d78d33e716536d9c8"/><file name="Cif.php" hash="f06024b41e15eb17b48d57e0b3545a4f"/><file name="Data.php" hash="b45df75412993e948d6846f891f2a6fd"/><file name="Date.php" hash="a9d8269fc2f482cbb56d285f1a7e2498"/><dir name="DeliveryOptions"><file name="Fee.php" hash="0bea0d72d07f67e4e81eff2d9cd20460"/></dir><file name="DeliveryOptions.php" hash="4cd080a8fcaee119495ee7a16221766e"/><file name="Mijnpakket.php" hash="4e2868c2420ed3ae04f6aa39f1491fd6"/><file name="Parcelware.php" hash="186b41ea5ff5f95f27eee2bdcdc2e554"/><file name="Payment.php" hash="654932a980a34c58fd5b5854ebbf13a8"/><file name="Webservices.php" hash="ed9834c4bb7afa088701c894590e40eb"/></dir><dir name="Model"><dir name="AddressValidation"><dir name="Cendris"><file name="Abstract.php" hash="50c033ec698cede75909218c10407a51"/></dir><file name="Cendris.php" hash="e1f6c7f6b2a3cba3cc7b0202b1112588"/><dir name="Observer"><file name="AddressBook.php" hash="500df77a7d02b3e2beab105f70491d29"/><file name="OneStepCheckout.php" hash="881144684006dee7fd19f3a1ceafda0e"/><file name="Onepage.php" hash="15dce59c220b464341341d9607c7a15b"/></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="ValidateAccount.php" hash="93e274a7a9d51d180eebcf534c3278ae"/></dir></dir></dir></dir><dir name="Admin"><file name="Inbox.php" hash="ec5296dc861d31e076f68e15f50b8fa3"/><dir name="Logging"><dir name="Handler"><file name="Postnl.php" hash="8d4084fb026faf90aa92db70f014d3f8"/></dir><file name="Observer.php" hash="e510d279768c5c884c112dc1415854c6"/></dir></dir><dir name="Adminhtml"><dir name="Form"><dir name="Element"><file name="Checkbox.php" hash="1d1d599f8f77e689cd99b0a56406c658"/></dir></dir><dir name="Observer"><file name="OrderGrid.php" hash="93aa40c60c4fc1afefce136f8c3460cc"/><file name="ShipmentGrid.php" hash="88bafd93f9a6130786ee0b8e66f71416"/><file name="ShipmentView.php" hash="b98b741eb1baca0c91a47427873281d3"/><file name="SystemConfig.php" hash="2b230b2332ca8624e702ea2873a4d28f"/></dir><dir name="Support"><file name="Logs.php" hash="9015b88009cd9fe4272f7e1c515a3c1e"/></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="OrderGridColumns.php" hash="43b606fb5126a37deb932323776ed018"/><file name="OrderGridMassaction.php" hash="fbe0d93e489c33dee7ac78e2b46f71ce"/><file name="ShipmentGridColumns.php" hash="0f454ed444c2b336b679851ba4628315"/><file name="ShipmentGridMassaction.php" hash="cc0020d8889bd2b3b882e1239ca3a5d3"/></dir></dir></dir></dir><dir name="Carrier"><file name="Matrixrate.php" hash="06770348fd20799930fde401f4f13f36"/><file name="Postnl.php" hash="2b3b4fdfb082875f1733710ce19ef87c"/><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Shipping.php" hash="514f8b23118b99fcda2f9c9c03869c0e"/></dir></dir></dir><dir name="Resource"><dir name="Matrixrate"><file name="Collection.php" hash="2a1c138a047d05d8e6c60ab6f72b7513"/></dir><file name="Matrixrate.php" hash="32521fef38856bd278e007106a8302f8"/><dir name="Tablerate"><file name="Collection.php" hash="6e88398632a25d1e2764077baeb2bc34"/></dir><file name="Tablerate.php" hash="0c1accf31df8fea3b5957c3ec153e04e"/></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Matrixrate.php" hash="b577a98aaf72c2d257b70c90fe3359b7"/><file name="Tablerate.php" hash="350d5ad8dbc4642c57ce43f09b2f0abb"/></dir><dir name="Source"><file name="RateType.php" hash="bf48a14786d0c082c77e5030569e722e"/><file name="TablerateSource.php" hash="c6db35abf67e414753170899e6a32574"/></dir></dir></dir><file name="Tablerate.php" hash="f04830fdd0204e77fd3722a3126e053f"/></dir><dir name="Checkout"><file name="Cif.php" hash="7ccfe830d1014b72dcc4cde189ababeb"/><dir name="Observer"><file name="Order.php" hash="9bc4e68ff3aa044d354a8cfd7c6d2973"/><file name="Shipment.php" hash="d1476ec8b026526652944578f3cdc6e0"/></dir><file name="Order.php" hash="4a6595b1d38ee5e9bb59121217c7d7ec"/><file name="Service.php" hash="643115d26dd7d0fbb0403201821a0d22"/><dir name="System"><dir name="Config"><dir name="Source"><file name="ActivePaymentMethods.php" hash="25641b223a79ae37ef3748b5bcb8ff10"/><file name="CmsPage.php" hash="9fc61473b5b3ad4692c694b0090020d0"/></dir></dir></dir></dir><dir name="Core"><dir name="Api"><file name="V2.php" hash="fcc859d18412537c16dd5a05048fe389"/></dir><file name="Api.php" hash="5713490c5a033f2feb92944cbe710643"/><file name="Cache.php" hash="6ac64a62771b5a149b2069bbcb207027"/><dir name="Cif"><file name="Abstract.php" hash="0a153e5528029d7ab14c7c3d2bbadb69"/><file name="Exception.php" hash="bc208a7f87f76017f95367791b5a757a"/></dir><file name="Cif.php" hash="cc14265785601a2f3235fa1fe7a84054"/><file name="Label.php" hash="27b71e7d2887f4b6e3ad7f2ed7d01909"/><dir name="Observer"><file name="Barcode.php" hash="ad88f42dae63a5026175ad48c9867496"/><file name="Cache.php" hash="069ebcbb34d8374da85f5215dd62b64c"/><file name="Cron.php" hash="5b2624ed83115b047649d2bc328a8438"/><file name="Returns.php" hash="615e291be056343d1b6c2315973ef923"/><file name="SaveShipment.php" hash="a5d68c8d535bd223446eb266be27c64c"/></dir><file name="Order.php" hash="45306091a47ec9ef89c00b9dfb6c90ef"/><file name="PackingSlip.php" hash="8ed61657da450aafa3a1224d06ad75f8"/><dir name="Packingslip"><dir name="Pdf"><dir name="Items"><dir name="Invoice"><file name="Default.php" hash="bcc11102dd46f50b24ab638272f08bec"/></dir></dir></dir></dir><dir name="Resource"><dir name="Integrity"><file name="Collection.php" hash="801fef1fa85ce429ad6a183c047d2f30"/></dir><file name="Integrity.php" hash="02fda656ed92340c0cd9ed04cdf4e021"/><dir name="Order"><file name="Collection.php" hash="7833da8c9b02253fa34b3a7f0dfac065"/></dir><file name="Order.php" hash="dc95e51a1246ab1c11edc208fc7033b1"/><dir name="Shipment"><dir name="Barcode"><file name="Collection.php" hash="5b52ea9f06abffc9d3f43a102faf9b66"/></dir><file name="Barcode.php" hash="866e9b9fba53b6b92b91cdee9f54be9d"/><file name="Collection.php" hash="5615baafe4dd845657ad770b9bd20960"/><dir name="Label"><file name="Collection.php" hash="a1db2bb6a3c928a8e5b3ab369a46e49d"/></dir><file name="Label.php" hash="0fb2575b876d9afa43506ef673a07890"/><dir name="Status"><dir name="History"><file name="Collection.php" hash="2a7f814cf8272411106b82290dbe986a"/></dir><file name="History.php" hash="e0b88660d2f70dbb64931267e356887f"/></dir></dir><file name="Shipment.php" hash="aed109e5357ab39a8b787da35cd8adf1"/></dir><dir name="Service"><file name="IntegrityCheck.php" hash="8018c9670c0628cbcffb5a016d69024e"/><file name="InvoiceDummy.php" hash="44685782fb45d538e52fa55af499a98d"/><file name="OrderDummy.php" hash="692f3dbd80474a91e94260b2d7a36093"/><file name="PaymentDummy.php" hash="cbf5cc5602001b04773cbca56638f6ff"/><file name="PaymentMethodDummy.php" hash="fb6c9d1ff9476a7837b12bb2b182deab"/><file name="Shipment.php" hash="ed78a6f67553fdf2d7fe4189506da367"/></dir><file name="Service.php" hash="efbc3d15489140ca6467601470bc2677"/><dir name="Shipment"><file name="Barcode.php" hash="d832ccbc623866dc4734569bc10904bd"/><file name="Label.php" hash="c6b66bc313cbf12df5dd03f2030957c3"/><file name="Process.php" hash="dfc7ca384ec53e190d030c77c09ac77c"/><dir name="Status"><file name="History.php" hash="4eb1d2b51250ed211c8d9a3daee7eab5"/></dir></dir><file name="Shipment.php" hash="0302f184c6a350ac37bc6bdae4e54cde"/><dir name="System"><dir name="Config"><dir name="Backend"><file name="HourMinute.php" hash="554a64b90a144a2befd5b08910415fe8"/><dir name="Image"><file name="Pdf.php" hash="4bea24f4e50dbed7656cbb16a026b030"/></dir><file name="SenderCountry.php" hash="3babb54a85ee385ced4f7c8ecab9e2ec"/><file name="ValidateDefaultOption.php" hash="13fd85e0856fa4727dd8fd48280497bb"/></dir><dir name="Source"><file name="AllProductOptions.php" hash="ced20eddf4d92e33de6a36bebf1e201e"/><file name="Attributes.php" hash="2473c5ea43dc870d0fc8c9ca65ce114f"/><file name="BuspakjeProductOptions.php" hash="61160df0a489706d8aaf667824a4667a"/><file name="CheckoutExtensions.php" hash="11a6a8677dc17953aad9bed4d3255e9e"/><file name="CommentType.php" hash="45f7d07778d18d65985aa27a96bc6435"/><file name="CutOffTime.php" hash="81cee271d87bcfea0e00743a8c0890d8"/><file name="DebugMode.php" hash="523dcaf9a609ac98394fd2b2c08d671f"/><file name="Direction.php" hash="311ab3017a41f2e2b74546f908580e1d"/><file name="EuProductOptions.php" hash="82b22e6dd7216b906ddd75acf1455cd8"/><file name="GlobalProductOptions.php" hash="55a47c89eb97f2818d197c15fd8f75da"/><file name="GlobalpackShipmentType.php" hash="671b24f7531e28a5bdcdae6af132c0a6"/><file name="HourMinute.php" hash="94a06e8e207905706a1dc5f659d1763a"/><file name="LabelSize.php" hash="47c7df3c8be3c4cbc18a9ef3657bfa80"/><file name="ManualAutomatic.php" hash="33e2dc23ad7c1cec65ed399eb503ae2c"/><file name="PackingSlipItemFields.php" hash="8996461b8aa59c4ca4f665f6efc0046b"/><file name="PackingSlipLabel.php" hash="79671ca1c255f5fbdf775598f30a4b7a"/><file name="PakjeGemakProductOptions.php" hash="8ac50f9b9fc670f1112e126f6ce3628a"/><file name="PakketautomaatProductOptions.php" hash="21fd7ca0391391ec70646e8210d0d9b3"/><dir name="ProductOptions"><file name="Abstract.php" hash="c4937117ff0eef9b09cb5c0397286306"/></dir><file name="ReferenceType.php" hash="4f404910f2989464e5b107e15be0c0eb"/><file name="SenderCountry.php" hash="fcba64b64dd4fe76230bbad825ec975e"/><file name="ShippingDays.php" hash="185cd2b5e5fcdc380fb607591b054a3e"/><file name="ShippingDuration.php" hash="1aa01df7274c360143fb0b2963ce9e68"/><file name="ShippingMethods.php" hash="5779b9e9c9af5cb2c6a5d25b761227b0"/><file name="StandardProductOptions.php" hash="e7546057915a3acfcc97c40ee9c78e4c"/><file name="StaticBlocks.php" hash="1c3d2fc026d1afc7a7108b61e76828b7"/><file name="StreetField.php" hash="80123df69368755513c4341306bd2065"/><file name="StreetFieldWithDefault.php" hash="bac4f43be478165ca454d2423f611a77"/><file name="SundayProductOptions.php" hash="22130290e3e05b703e77a0206941c78d"/><file name="WeightUnit.php" hash="b6bbe9c7c8c2ae76d991963a3f44cd99"/></dir></dir></dir></dir><dir name="DeliveryOptions"><file name="Cif.php" hash="54ac1692bd35301f4c9f3fada543e5e1"/><dir name="Observer"><dir name="GoMage"><dir name="LightCheckout"><file name="Ajax.php" hash="12682d1c78338fbae4ee9739f5096983"/></dir></dir><file name="ShippingMethodAvailable.php" hash="2ad9bf64aee177805a321653610e198f"/><file name="UpdatePostnlOrder.php" hash="819b61ef0fbed3f944f8df458e92dd6d"/></dir><dir name="Product"><dir name="Attribute"><dir name="Source"><file name="ShippingDuration.php" hash="90349cc22cb674e66ab781a306edf254"/></dir></dir></dir><file name="Service.php" hash="0bf672ab839bda360794c74b7132552e"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="ValidateFee"><file name="SundayDeliveryFee.php" hash="a08f2591640c8536ce62b14759f7388b"/></dir><file name="ValidateFee.php" hash="e9be068f77d2c30c9b8ccec5d08c9de2"/></dir><dir name="Source"><file name="DeliveryDaysNumber.php" hash="1d8efcdf01df2d64f526c9252d1f7b0b"/><file name="StockOptions.php" hash="441c9cefc7338910a2945757f7842366"/><file name="Themes.php" hash="9b9e2ea217313bbc4b426dfa04f74f66"/></dir></dir></dir></dir><dir name="ExtensionControl"><file name="Config.php" hash="f8c7c6f3861226a4b7be138f2931c6d2"/><file name="Feed.php" hash="f4a9f3a94304e2b0232ce7bd6a387d5a"/><dir name="Observer"><file name="Cron.php" hash="4c6cb0450d529f262fc6fd8291b672de"/></dir><dir name="Webservices"><file name="Abstract.php" hash="c76ee8ce49daf8d196831de07c7cd669"/></dir><file name="Webservices.php" hash="b8fbe739eba545e6e69d3dd9b82aca01"/></dir><file name="Inbox.php" hash="7b8a986f8015a7b02bda5dd8a62ec142"/><dir name="Mijnpakket"><file name="Cif.php" hash="1b3aee253fd6774eee7e2ff0e16735d3"/><file name="Service.php" hash="8d077e3ec1ab1da2f7546c9164d19fc6"/></dir><dir name="Parcelware"><file name="Export.php" hash="8376fb5198cebb9c37f748cb10b723a9"/></dir><dir name="Payment"><file name="Cod.php" hash="02b89a8c029b61b7d302424b1e6fb719"/><dir name="Observer"><file name="Cod.php" hash="babbb29d7bd51962c0a421a4162806b6"/></dir><dir name="Order"><dir name="Creditmemo"><dir name="Total"><dir name="CodFee"><file name="Abstract.php" hash="d094101edbd45da5014d8da7596aeb42"/></dir><file name="CodFee.php" hash="61649dc792fef11e833d6a6438fb4bd3"/><file name="CodFeeTax.php" hash="2e171923277c33a239e4f0c3eadb3d98"/></dir></dir><dir name="Invoice"><dir name="Total"><file name="CodFee.php" hash="1fba67d2cfbfd26a0a253ca9e83e7f55"/><file name="CodFeeTax.php" hash="a16e2216e8f156edb316fa4d3acdcf65"/><file name="Subtotal.php" hash="4d93dbab0e57076404275983d7ecefb6"/></dir></dir><dir name="Pdf"><dir name="Total"><file name="CodFee.php" hash="73eddd5e61452a2e018dfa6af3c1464b"/><file name="Grandtotal.php" hash="f9baa2ba4d712cbe6ed677d95aaa8a0e"/><file name="Tax.php" hash="5685ecae76e17277736901942f851452"/></dir></dir></dir><dir name="Quote"><dir name="Address"><dir name="Total"><dir name="CodFee"><file name="Abstract.php" hash="183493f74e29e0f01a6550c3cceb07bd"/></dir><file name="CodFee.php" hash="9c6d0e1695f274c06b1d6ecbc41a74cd"/><file name="CodFeeTax.php" hash="227ab37a8fa18162093257bca9235151"/></dir></dir></dir><file name="Service.php" hash="7b2e6ceb6c167bb55cca7b472206cb47"/><dir name="System"><dir name="Config"><dir name="Source"><file name="CodFeeTaxClass.php" hash="44551d5944906bbc3d3228131324b84c"/></dir></dir></dir></dir><dir name="Resource"><dir name="Catalog"><file name="Product.php" hash="42e4000e43176e1d6ee4336781478673"/></dir><dir name="Db"><file name="Abstract.php" hash="5abcdd8977c7000f81157991be5e4254"/><dir name="Collection"><file name="Postnl.php" hash="6d58f3700831f61c51f711f64684b09b"/></dir></dir><dir name="Order"><dir name="Grid"><file name="Collection.php" hash="9014651adaab7bce2b670dba10d97b62"/></dir><dir name="Shipment"><dir name="Grid"><file name="Collection.php" hash="3d1f13f598acbaa561a36f1a91882064"/></dir></dir><file name="Shipment.php" hash="8b9f972ad5b3ae1ccd3a7721ee347120"/></dir><file name="Setup.php" hash="53ef56d50d9681ae5c761d308122bddc"/></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Checkbox.php" hash="0406128f26b82124d3b9ac698dfa8b09"/></dir><dir name="Source"><file name="Testlive.php" hash="ddd6fab7b721c4776355c5970df35716"/><file name="Yesno.php" hash="eed431ec0c66f961063b71f7150d8c20"/></dir></dir></dir></dir><dir name="sql"><dir name="postnl_setup"><file name="install-1.0.0.php" hash="0dc89283fefae06eda154b0d24dc01f9"/><file name="upgrade-1.1.5-1.2.0.php" hash="2881d8847c87c32ebfb5803f436cf024"/><file name="upgrade-1.2.2-1.3.0.php" hash="157203a83d21987b05088e2dc826bbc5"/><file name="upgrade-1.3.1-1.4.0.php" hash="5aaa53a0ae8eb13e746f8653f8d3ace1"/><file name="upgrade-1.4.1-1.5.0.php" hash="e1dcb902c674cb23072383b2872e554a"/></dir></dir><file name="Exception.php" hash="4e387d54ace504eb1a3e9dcf683283fa"/><dir name="Controller"><dir name="Adminhtml"><file name="Abstract.php" hash="3a9c4368b6341595a54d0f42674b9d46"/><file name="Config.php" hash="48248ae95f4f8d598c6505cc8555058b"/><file name="Shipment.php" hash="66b4938de6b9c8c2918d3ef6288c5114"/></dir><file name="Sales.php" hash="cb8ae934de6a38903e8ccfc76acf79bd"/></dir><dir name="docs"><file name="modman" hash="1af20fda3c00366cd3bce971af94ec54"/></dir></dir></dir></target></contents>
|
| 427 |
<compatible/>
|
| 428 |
<dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php></required></dependencies>
|
| 429 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>tig_postnl</name>
|
| 4 |
+
<version>1.7.2</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US">Creative Commons License</license>
|
| 7 |
<channel>community</channel>
|
| 20 |
- Viewing detailed shipping status information
|
| 21 |
- PostNL Checkout
|
| 22 |
- Emailing customers track & trace information, allowing them to track their shipment from the moment you confirm it to the moment it arrives at their doorstep</description>
|
| 23 |
+
<notes>==== v1.7.2 ====
|
| 24 |
+
==== Improvements ====
|
| 25 |
+
- A timeout has been added for the AJAX calls of the delivery options. The timeout is set to 5 seconds.
|
| 26 |
+
- Monday delivery is clearly marked as Monday delivery in both the front- and backend now.
|
| 27 |
+
- Optimalisation of the ordergrid filter when the PostNL extension is being used in combination with the Adyen extension.
|
| 28 |
+

|
| 29 |
+
==== Bug Fixes ====
|
| 30 |
+
- An issue where Zend_PDF could show errors at specific combinations of characters.
|
| 31 |
+
- An issue where orders without a delivery date could show error messages in the ordergrid
|
| 32 |
+
- An issue during processing orders with delivery options in the OneStepCheckout.
|
| 33 |
+
- And issue where the PostNL payment methods were not visible for the Netherlands if the EPS shipping method wasn't selected.
|
| 34 |
+
- An issue where you could select a delivery location when this option was disabled.
|
| 35 |
+
- An issue where fatal errors could occur when the PostNL extension was being used in combination with the GoMage checkout.
|
| 36 |
+
- The zipcode check works in OneStepCheckout when no countries are selected now.
|
| 37 |
+
- Order won't be set at "Ship next day" when no delivery options are enabled.
|
| 38 |
+
- Added missing delivery options at the creation of shippments
|
| 39 |
+
- Shipments outside of the Netherlands won't give a delivery date anymore.
|
| 40 |
+

|
| 41 |
+
==== v1.7.1 ====
|
| 42 |
==== Improvements ====
|
| 43 |
- Refactored references to the TIG_POstNL_Helper_DeliveryOptions class' fee methods so they now call their counterparts in the TIG_PostNL_Helper_DeliveryOptions_Fee class
|
| 44 |
- Refactored the canUseDeliveryOptions method for GoMage LightCheckout to improve performance
|
| 439 |

|
| 440 |
This is the initial beta release of the extension. If you have any questions, please contact the Total Internet Group Servicedesk</notes>
|
| 441 |
<authors><author><name>TiG</name><user>supporttotal</user><email>servicedesk@totalinternetgroup.nl</email></author></authors>
|
| 442 |
+
<date>2016-01-04</date>
|
| 443 |
+
<time>16:31:39</time>
|
| 444 |
+
<contents><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="TIG"><file name="postnl.xml" hash="9e82023fd46f786583dba4afd3b2da48"/></dir></dir><dir name="template"><dir name="TIG"><dir name="PostNL"><dir name="address_validation"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="0cb781955d33fae46da09d62bd6fdaf3"/><file name="postcode_check.phtml" hash="bb41cb9863f2a6a85cf1110c2cab8160"/><file name="shipping.phtml" hash="202f4808d3658d510175c6b975991da5"/></dir></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash="eb3f3f53d153c42165cf70085e026b60"/><file name="postcode_check.phtml" hash="cbb8bfd76db65041cafacf976312ceb7"/></dir></dir><dir name="gomage_checkout"><file name="billing.phtml" hash="e185cac738b3e9808fb41131e257f2a6"/><file name="postcode_check.phtml" hash="2b52392607c53b194470edc10a42a47e"/><file name="shipping.phtml" hash="13ce6e8d74a737ca25f2e57bcb237b9a"/></dir><dir name="onestepcheckout"><file name="billing_fields.phtml" hash="1e04cda4539618f3738fea300682e8e9"/><file name="postcode_check.phtml" hash="722c16377e99b2959c0905b219a06776"/><file name="shipping_fields.phtml" hash="ed8e95313ca98b83f7acbe94ea39876b"/></dir><file name="validate.phtml" hash="75438f5484ae966f288b7bde7e225b0a"/></dir><dir name="checkout"><dir name="cart"><file name="js.phtml" hash="a9718e822a674ae768bc6a532bbb0e13"/><file name="link.phtml" hash="ecd5c96cb1a46f51270c3784232a5c47"/><file name="spinner.phtml" hash="26b8da7f12ef206b9768b325ad547c1b"/></dir><file name="summary.phtml" hash="0b5ba3d2ef1b1d17eca3c3bc603c265f"/></dir><dir name="core"><dir name="order"><dir name="returns"><file name="info.phtml" hash="1eb800d518ea4ac848c42850c6983b66"/><dir name="shipment"><file name="items.phtml" hash="a6b56265412c3e0f24e4cfc6b44e145d"/></dir></dir></dir><dir name="page"><dir name="html"><file name="js_translate.phtml" hash="3a12ce7789322fd513435101b5763811"/></dir></dir><dir name="sales"><dir name="order"><dir name="email"><file name="delivery_options.phtml" hash="69ed5e3c4f9c5892e79fc862ae1af977"/><file name="pakjegemak_address.phtml" hash="4d66bc2a22d6916c8fe5388cf12b734a"/></dir><file name="pakje_gemak_address.phtml" hash="9c3f945dc11c6e7ab11c2a801c15617d"/><dir name="shipment"><file name="shipping_status.phtml" hash="e20200a32d1f40f661260e58ded904b9"/></dir></dir></dir></dir><dir name="delivery_options"><file name="addlocation.phtml" hash="8c44b58eb6e2df3909bfe0c460a28e7d"/><file name="addphonenumber.phtml" hash="9d7f5b6f1c25b753c39b9d9a75bf8809"/><dir name="gomage_checkout"><file name="available.phtml" hash="0b3c21257571a54a0ae84f290f0d5d5e"/><file name="deliveryoptions.phtml" hash="9af16964fb1de297e42357ce4c41217a"/></dir><file name="js.phtml" hash="1090c61caf8925a6961ce55460246294"/><dir name="onepage"><file name="available.phtml" hash="100e509f0c2cb82e22de0735a4afc144"/><file name="deliveryoptions.phtml" hash="1951be36e1462365ddd2e5c584ee633c"/><file name="pickup_notification.phtml" hash="8a2262e00a82aac73f565fbf6ef160c3"/><dir name="progress"><file name="pakje_gemak.phtml" hash="07646cfd17ba8ddb1889ae0c01554440"/><file name="shipping_method.phtml" hash="cc7a33fa2411b444d1a23a053e313d66"/></dir></dir><dir name="onestepcheckout"><file name="available.phtml" hash="0b286aa4c191af9fe3c1cfda510aac71"/><dir name="bpost"><file name="available.phtml" hash="379d301a12d598d164b5afb0fac126b1"/></dir><file name="deliveryoptions.phtml" hash="6020376a0980f56ce587d8b386477852"/></dir><file name="progress.phtml" hash="4e17a7cc24bda609244091b767817cf1"/><dir name="sales"><dir name="order"><file name="delivery_options_info.phtml" hash="263147e3762bbfd2cba230a2d7ec21b5"/></dir></dir><file name="theme.phtml" hash="ae93d3471327a0525388264af2575382"/></dir><dir name="mijnpakket"><file name="account_notification.phtml" hash="8579d5a7735de1831fa58f08e2f5579c"/><dir name="gomage_checkout"><file name="js.phtml" hash="1c57ff5b07a2c7123c5cc01a41e6853e"/><file name="login_button.phtml" hash="32962237f54619e75d098daaebbfab7f"/></dir><file name="js.phtml" hash="66014d70ce25f90fa651a33537335817"/><dir name="onepage"><file name="login_button.phtml" hash="3d4d1b47e88127f431042d30df1d3ef6"/></dir><dir name="onestepcheckout"><file name="login_button.phtml" hash="a5e7ca1d245a33fd262afe44449f7ac6"/></dir><file name="order_success_js.phtml" hash="165cf4aa0837bfb5c1034846e58bd17d"/></dir><dir name="payment"><dir name="checkout"><dir name="form"><file name="cod.phtml" hash="2ec13ce1d1d2f08e04d9db87d9b503fe"/></dir><dir name="total"><file name="cod_fee.phtml" hash="9273dca9058bc1e782ad6750be468d96"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="rwd"><dir name="default"><dir name="layout"><dir name="TIG"><file name="postnl.xml" hash="88bc2129c1be42f128e0b081712765ea"/></dir></dir><dir name="template"><dir name="TIG"><dir name="PostNL"><dir><dir name="address_validation"><dir name="checkout"><dir name="onepage"><file name="postcode_check.phtml" hash="db2c4471a2a72231e9e48846827d3af6"/></dir></dir><dir name="customer"><dir name="address"><file name="postcode_check.phtml" hash="9d52ad0c9e9879dbdd9a456bbc26c6b3"/></dir></dir></dir><dir name="checkout"><dir name="cart"><file name="link.phtml" hash="9421d86c9999726b5f4fbeb2bd444ae8"/></dir></dir><dir name="mijnpakket"><dir name="onepage"><file name="login_button.phtml" hash="bfaf1bf82634b1f23dcce616a905f017"/></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="TIG"><file name="postnl.xml" hash="1edaba7a5995edecaee7448cdbe0e97a"/></dir></dir><dir name="template"><dir name="TIG"><dir name="PostNL"><file name="cron_notification.phtml" hash="67bbd1d6737e958906d0378f4b246387"/><file name="integrity_notification.phtml" hash="f8bb74b367cd4c1d65b203571db5af70"/><file name="log_notification.phtml" hash="b823242d8db7e1f1ccfb603c653922f0"/><dir name="payment"><dir name="checkout"><dir name="form"><file name="cod.phtml" hash="145ff33fea020e3e3148c641c9b98bc6"/></dir></dir></dir><dir name="sales"><dir name="items"><dir name="column"><file name="qty.phtml" hash="ee6a8f8fa3515ae96daa5ab5931b50be"/></dir></dir><dir name="order"><dir name="address"><dir name="form"><file name="container.phtml" hash="c70f2fca642dd867f51c265f5bd24421"/></dir></dir><dir name="create"><file name="js.phtml" hash="45ece3a5af2b5b720158f6f9910ede7c"/><dir name="totals"><file name="cod_fee.phtml" hash="024424c5e3b8f23e8f424fa015ba23b6"/></dir></dir><dir name="creditmemo"><dir name="create"><dir name="totals"><file name="cod_fee.phtml" hash="a35bb3ed9e43e09a5c966c3621566cd9"/></dir></dir></dir><file name="filter_massaction.phtml" hash="5767fd53a9eed4d361332dddd97a12ac"/><file name="js.phtml" hash="18ec1303ae3a85e40107c070c7547461"/><file name="product_options.phtml" hash="fac95293486e5a81d5981b3b717aaa4a"/><dir name="shipment"><dir name="create"><file name="shipment_options.phtml" hash="8b1d766540b21d4b13c66835bb0c149d"/></dir><file name="filter_massaction.phtml" hash="d4e0379e6a96a5fd92ace380715549b9"/><dir name="view"><file name="delivery_options.phtml" hash="c0ea2d69a6835738a1b29736ab839a8e"/><file name="pakje_gemak_address.phtml" hash="d9dbf8a4ae4d2c3efccf8696d64b580a"/><file name="shipping_status.phtml" hash="2f7b0378604f69b0da2a4a2b7a642b72"/><dir name="tab"><file name="status_history.phtml" hash="2ffe0b40dea1e06af41498702a066cea"/></dir></dir><file name="view.phtml" hash="00087383abc14dd8400ba17e3aeda003"/></dir><dir name="totals"><file name="tax.phtml" hash="ab09fbdc3a7673ca587d8c6de4c02ffd"/></dir><dir name="view"><file name="delivery_options.phtml" hash="9513fa23651226adb23437bfc0f0372a"/><file name="pakje_gemak_address.phtml" hash="dc87c6cfce56eb69ea5e2a86d522212c"/></dir><file name="windows_theme.phtml" hash="55103508fe6bb75628ef0c5901c08666"/></dir><dir name="shipment"><file name="customize_link.phtml" hash="efe9c3208669fe44b15725f86ce22c63"/><file name="js.phtml" hash="ab44d94f816af3eb1f59ca4044d79214"/><file name="testmode_warning.phtml" hash="def163c3796aae431b07351f03cd6ed0"/></dir></dir><dir name="system"><dir name="config"><file name="edit.phtml" hash="4f073927211c81a65263953cfbe87170"/><dir name="form"><dir name="field"><file name="array.phtml" hash="6bb1f404b24129b198c9c95a28c1bd66"/><file name="config_check.phtml" hash="cf8ab0445473583fcdcc997e30d58164"/><file name="field_header.phtml" hash="5ca62f4d7b2b0817e3416a4c6089e145"/><file name="info_box.phtml" hash="f387052ae039703f04a76ae255aa2508"/><file name="js.phtml" hash="35d5521c921b474e40373e5c7e30c45c"/><file name="split_address_check.phtml" hash="f23ca53d46419f7438fbd1c5ba164f2e"/><file name="support_tab.phtml" hash="308a0962fc31abfe09c6b5a03aabed14"/><file name="warning_box.phtml" hash="9841c9270a4ec7049ee6a46cc6bcb6e3"/></dir></dir></dir></dir><file name="upgrade_notification.phtml" hash="9e9f1a1331b432c56889cfa4df06f8a7"/><dir name="widget"><dir name="grid"><dir name="massaction"><file name="label_start_pos.phtml" hash="244c60efd2281a12206987dca2f5a73c"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="TIG_PostNL.xml" hash="bc88adf886505eac7c8fd420b5a775a2"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="TIG"><dir name="PostNL"><file name="cart.css" hash="d51ab6c200da5c54eb8e672c9325dbf5"/><file name="default.css" hash="46f2e8f1748e604457cc1b237a0950f5"/><dir name="deliveryoptions"><file name="default.css" hash="e82b48626cd9640e6130e84dcb22a186"/><file name="gomage_checkout.css" hash="5a06cdff83cf7129aefe4bd4614c07b0"/><file name="gomage_checkout_mediaqueries.css" hash="1059ae216e39968ce3122e1485ee0458"/><file name="gomage_checkout_neutral.css" hash="cb2cc910a3e96ed3fc9b23d20a6f34eb"/><file name="ie8.css" hash="1f0e04ca6c7be6572defb3adadafd28a"/><file name="mediaqueries.css" hash="3e8b87e8f0f30cbbe83686fa59bfd482"/><file name="neutral.css" hash="4b3b09545e3395f302e1efd487bf2739"/><file name="onestepcheckout.css" hash="fd7d786cc66c34b81555111e34c062eb"/><file name="onestepcheckout_mediaqueries.css" hash="2eb1086de2c12f7b728794fdf5ae431c"/><file name="onestepcheckout_neutral.css" hash="cb2cc910a3e96ed3fc9b23d20a6f34eb"/></dir><file name="messages.css" hash="19d03101c862b45535bc08344c12716a"/><file name="mijnpakket.css" hash="609c7c1218890f38bb9c4732ee5a0e2c"/><file name="postcodecheck.css" hash="af2e0297ed311d11b7bff818ec7b6d61"/><file name="returns.css" hash="23a6cb90aa662d2f866459e8ddf9a38a"/><file name="shipping_status.css" hash="fcb3fe311d50ee93176dc29ef2d5a0b9"/></dir></dir></dir><dir name="images"><dir name="TIG"><dir name="PostNL"><file name="bkg_progress_small.png" hash="fc6c9f28b6a6aae6f0096d504c0952df"/><file name="bkg_tooltip.png" hash="56cfed3ed8a65b19f8de88946d1a0a01"/><dir name="deliveryoptions"><file name="bkg_add-location.png" hash="a30d4aea73b094df5f434f9856dc626b"/><file name="bkg_add-phonenumber_input.gif" hash="25fa933b55e69a552f7d1cf704a8d6f9"/><file name="bkg_back_link.png" hash="b7bd79383aa89243980329e07b55a300"/><file name="bkg_btn-close.png" hash="5438c768cd63b2476cf14418acb28709"/><file name="bkg_button.png" hash="a1bf9f994f90033e143b7e2023c0e4fb"/><file name="bkg_checkbox.png" hash="71628b28d876482b600755e577132fee"/><file name="bkg_extras.gif" hash="6b374d9759f894962259eb995a3d59f9"/><file name="bkg_info_link.png" hash="0bf3dd9b4d23c7da406fa81ccb38799e"/><file name="bkg_location-search_input.gif" hash="fcee91af0d97e50fcf698eb7485327a8"/><file name="bkg_location-selected.png" hash="efe72719a889f94f4aa24e6f6d6db8df"/><file name="bkg_location.gif" hash="937e1a367cafdcc0d4f62afb572879a1"/><file name="bkg_more-info.png" hash="3681dc9b54011dae7c81d6c4b2e74a2b"/><file name="bkg_option.gif" hash="a3b9a292d28540147bfb034060731cb3"/><file name="bkg_phonenumber_failed.png" hash="8d1a0503bfe7cdfc2e35365bba2a8f7d"/><file name="bkg_phonenumber_verify.png" hash="28f90e0364778463144004ff289d70a7"/><file name="bkg_postnl-logo.png" hash="a34b5d938234a7360e5566df9fb4273f"/><file name="bkg_postnl.png" hash="46c5f6c65f66da09b39496c7cef94e89"/><file name="bkg_radio.png" hash="3cc3ecb77e5ce62511385d59e037b398"/><file name="bkg_rwd_rate-line.png" hash="d7cc800714e0372f2bc991bc50a99ca2"/><file name="bkg_tooltip.png" hash="cbd753cc9cb873468d1bba07e70f0d2f"/><file name="bkg_tooltip_close.png" hash="6b568d6430e21e974f360f4961db9102"/><file name="ie8_bkg_transparent-white.png" hash="a603671f51cb11ed9370bcd3181741c7"/><file name="loader_default.gif" hash="9fec99d885ad6bc45aee40d1c171ca4b"/><file name="loader_mini.gif" hash="f244ab6581d4329e3dbb7e289d47dfb2"/><dir name="locations"><file name="crc_albertheijn.png" hash="57af250f9d59b9074132446e0109ee93"/><file name="crc_automaat.png" hash="e9e94287380f27f6752d89f995b1b7f4"/><file name="crc_bruna.png" hash="326912294c49e8c896a34a28a7c03127"/><file name="crc_c1000.png" hash="8628f2e6328805a84e8eac28511b6857"/><file name="crc_coop.png" hash="0250717148ab776d156371a3e0912b9e"/><file name="crc_default.png" hash="777edf1aa124f6cb13258bb510db809b"/><file name="crc_emte.png" hash="ba7841f22a08d379f1ddabbe708ffa41"/><file name="crc_gamma.png" hash="6dc0ff8b36892af40ce80a36355d311a"/><file name="crc_jumbo.png" hash="061ae156e55e3aee6130cd1beb8d1b9a"/><file name="crc_karwei.png" hash="a7b8ee695b996cb757fd5c1a98e888e4"/><file name="crc_plus.png" hash="e67e871870c87723d835db23af18d4e9"/><file name="crc_primera.png" hash="e367c1e5b3fb4e25303aff57dc1a1259"/><file name="crc_readshop.png" hash="eeef9a98c0cd68f4351154d174bfdda9"/><file name="crc_spar.png" hash="4939d469045e6c7d7e65f172d97e30b1"/><file name="crc_staples.png" hash="94136b2a8d00dfdadcad6c7088920409"/><file name="drp_albertheijn.png" hash="944b90f36d5f225fcc74d360d368e628"/><file name="drp_automaat.png" hash="ce0bd13abc5e6c647c2ac8bc0fb5c150"/><file name="drp_bruna.png" hash="feb3ea92e3d32e98edf04aa22604afe6"/><file name="drp_c1000.png" hash="9e89a865b72d182135226fc72a98e03a"/><file name="drp_coop.png" hash="ddd34926b0a306cb0b28f385a78bd972"/><file name="drp_default.png" hash="d97f2e415e54b5d9fa19893210cedbc0"/><file name="drp_emte.png" hash="34e526c095a080cf92ccf15318a56ba3"/><file name="drp_gamma.png" hash="56da28b8c2e0ad6087eb0c4408f9904c"/><file name="drp_jumbo.png" hash="f191ec9c01b807d32811d9a4f0c3ad19"/><file name="drp_karwei.png" hash="d3da2d8b7f65ddecdf13091094a8fbea"/><file name="drp_plus.png" hash="9bf96ded99d0e47b34256cdc78310754"/><file name="drp_primera.png" hash="095b1ced03087b390b96ee3d525dce7e"/><file name="drp_readshop.png" hash="d2884c0bdd81103e9319469727bc9855"/><file name="drp_spar.png" hash="9ff6bb1fc489ba714d3249c35fb01c77"/><file name="drp_staples.png" hash="2196de7813fa6db34f8b0abb1aedecd5"/><file name="tmb_albertheijn.png" hash="58ae464ff7bb420f075e53cd35d9852f"/><file name="tmb_bruna.png" hash="ff523c258b47be502b335a7e8cc5032c"/><file name="tmb_c1000.png" hash="f96136426d2a2af40ef7b76953ec58b5"/><file name="tmb_coop.png" hash="b1e41c613b1876c787e9d4d5b30ba1a5"/><file name="tmb_default.png" hash="ed65f2da1032b355422db7c86a126668"/><file name="tmb_emte.png" hash="d0e9dc8f785b8db0da8bd233a0d09a11"/><file name="tmb_gamma.png" hash="55ef36ad8aa803469e28f368b7eac536"/><file name="tmb_jumbo.png" hash="3bae16290854122b2b3439de2402c5a1"/><file name="tmb_karwei.png" hash="84e1aaceb9c0ff3864b2b7aead52e033"/><file name="tmb_plus.png" hash="fd3bf32ffb591f79935bb906249ca59e"/><file name="tmb_primera.png" hash="fb32942772b4ca57a45ee0e08406c3bc"/><file name="tmb_readshop.png" hash="6a6826139698fa20e0fd4210d17b50e2"/><file name="tmb_spar.png" hash="89694e10f073619fd944d8c2c7b9e357"/><file name="tmb_staples.png" hash="115af373105f6494c74186657ddca6a6"/></dir><file name="osc_bkg_postnl-logo.png" hash="c23e987598dcd439e54f9d48e9e4777a"/><dir name="unbranded"><file name="bkg_back_link.png" hash="5797c608687a704a935b0ff03b8d3982"/><file name="bkg_checkbox.png" hash="232ad0ec83b32af770481bb1cdd1520e"/><file name="bkg_more-info.png" hash="96a0b80b2907a28489d8d87f845d8a5f"/><file name="bkg_radio.png" hash="430bea179fc0e6570c1cca905b46454e"/><file name="bkg_tooltip_close.png" hash="eac7d71f0cb14f165b6f7af55a6c4c26"/><file name="button_action.png" hash="c297cbc6aa5c44272308b660038b363f"/><file name="button_next.png" hash="768365d31d95bb5c8b1ccebb62920a95"/><file name="loader_default.gif" hash="1645395ddefeab89f51f59b2dbcbd7c0"/><file name="loader_mini.gif" hash="2fd11016727f350b98af17fc76b3a0d3"/></dir></dir><file name="icon-tooltip.png" hash="5767601cd66b23d0b6fe8defc10dd48d"/><dir name="mijnpakket"><file name="app_buttons.png" hash="74f3a4d80dafe1a0979ce7ad0bd70824"/><file name="app_logo.png" hash="e5426bac3d0b4e28ef1f3628503c2365"/><file name="logo.png" hash="6fa95b3a5e83b6887848b5feb7369bf1"/><file name="logo_small.png" hash="c23e987598dcd439e54f9d48e9e4777a"/></dir><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/><file name="overlay.png" hash="f08feb852288bea420ba3af68ae34a1f"/><file name="postnl_email_logo.png" hash="8bd358b514e04e7ceca03efb38f8fded"/><file name="postnl_spinner.gif" hash="cef321b68ab934932ee317986823db67"/></dir></dir></dir><dir name="js"><dir name="TIG"><dir name="PostNL"><file name="ajax.js" hash="ac8120be1ff0e421e80b14ad2617d4c1"/><file name="checkout.js" hash="e64437f55f7ccafb205a1d6f55995537"/><file name="deliveryOptions.js" hash="2a9bbba879516244519b74b03d9340a7"/><dir name="deliveryoptions"><file name="cufon-fonts.js" hash="7605bb17619f1a55e3521a700dfe7b1a"/><file name="cufon-settings.js" hash="9bb0303049c178db309438c26f7def2c"/><file name="cufon-yui.js" hash="2d0f7f2a050cc1a9c9456d97d29f5eda"/></dir><file name="formPopulate.js" hash="668076474b61c5295f82726a3235451a"/><dir name="gomage_checkout"><file name="mijnpakketLogin.js" hash="dcc34351b834646e41a88f5d6a9e6dea"/></dir><file name="livepipe.js" hash="b9f5e38a94ce3f4f6f6ebcabca23d8c3"/><file name="mijnpakketLogin.js" hash="b7a4c400044ba8e9aefd706c0193f778"/><file name="placeholder.min.js" hash="c2824272a822d3fb8429a239e7d20c24"/><file name="postcodecheck.js" hash="800dbf713c6787c516815914671471d5"/><file name="scrollbar.js" hash="b6780bb325e0ac78bc37e7b9d1bac863"/><file name="slider.js" hash="1679e9ff9a8d3784387040fc7cef9203"/></dir></dir></dir></dir></dir><dir name="rwd"><dir name="default"><dir name="css"><dir name="TIG"><dir name="PostNL"><file name="rwd.css" hash="4d14fe3ff05c4bf41a5161b113b15767"/><file name="rwd_osc.css" hash="d3b7cc449980f3dba097db6127a45f0c"/></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="css"><dir name="TIG"><dir name="PostNL"><file name="shipping_status.css" hash="d70f88078aa443807d249b3bf51320bf"/><file name="styles.css" hash="99c3298ef947a3e2d4a8aec7c88248cd"/><file name="system_config_edit.css" hash="103eaeae2d9e2a4a43b48a83ea7f2dad"/><file name="system_config_edit_postnl.css" hash="d25851e44a1d5c9beff046c2c0450ad0"/><file name="system_config_edit_postnl_magento16.css" hash="f9a8479639e2fe8d0da9cf602b1607c3"/></dir></dir></dir><dir name="images"><dir name="TIG"><dir name="PostNL"><file name="bkg_progress_grey.png" hash="8d4d5144292b98a23475367ede717b17"/><file name="bkg_progress_grey_begin.png" hash="6815c9264e78f8f9d2805c595f8800c4"/><file name="bkg_progress_grey_end.png" hash="dae90fdb38adf65e6ccc209b6a80372c"/><file name="bkg_progress_grey_seperator.png" hash="10178e12fd14fb783b4ae0fbd55a4a81"/><file name="bkg_progress_orange.png" hash="8a59f76e36ee0492f5341b8e5e7ee79b"/><file name="bkg_progress_orange_begin.png" hash="ecc84d5252e397f4a783ee7e0c426d63"/><file name="bkg_progress_orange_end.png" hash="d0a81dfea1a3eddc699482a62af01fc9"/><file name="bkg_progress_orange_grey_seperator.png" hash="ab558953ec4c40ef44653ab481084345"/><file name="bkg_progress_orange_seperator.png" hash="a774eb89763d95f2e60d03f8702fba86"/><file name="bkg_progress_sprite.png" hash="3230379a4544f85062a6ba91fa8083e2"/><file name="bkg_progress_sprite_reverse.png" hash="c27c9ac49dd3c82f6351307d7b63f36a"/><file name="bkg_tooltip.png" hash="56cfed3ed8a65b19f8de88946d1a0a01"/><file name="btn_download_icon.png" hash="142d5ebbe43ad09dde97cd32e1ef4303"/><file name="glyph_error.gif" hash="a138b803d772f552aa2e49e1c506edbd"/><file name="glyph_go.png" hash="343996189e35c6685b90993b43059ecd"/><file name="glyph_info.gif" hash="40f72d28be63ecf2b6ef44c7ea730104"/><file name="glyph_manual.png" hash="771db63b6ffc9de1c06da564796adc6e"/><file name="glyph_pdf.png" hash="a5ea929f4014a88d7320d0293913ace3"/><file name="glyph_success.gif" hash="465a056a3ba3d94367f51c3c0b751391"/><file name="glyph_warning.gif" hash="fa817cb6d49efb9855942ef2b739fc6c"/><file name="icon-tooltip.png" hash="5767601cd66b23d0b6fe8defc10dd48d"/><file name="legend.gif" hash="d8fb0642901868d489d31b426f3e3406"/><file name="loader_default.gif" hash="9fec99d885ad6bc45aee40d1c171ca4b"/><file name="logo_postnl.png" hash="10b9ae4ad2c5365312c257dcdac1fc64"/><file name="tig_logo_medium.gif" hash="3e1071908cfdb7b472438482c3331ac7"/></dir></dir></dir><dir name="js"><dir name="TIG"><dir name="PostNL"><file name="configuration.js" hash="6ca6c63dddc579f825ae0a3214a7d59d"/><file name="form.js" hash="4586e90d9f3a1c96531fc9f19c0901d0"/><file name="mass_action_filter.js" hash="7005d1ecd9a6c1e16d14a2aa3cb0b11c"/><file name="validate.js" hash="84a9bc86137c3d2dd488eee8bd2e3fc9"/></dir></dir></dir></dir></dir></dir></target><target name="magelib"><dir name="TIG"><dir name="PostNL"><dir name="Fpdf"><dir name="font"><file name="courier.php" hash="ca6fb483549604fb4a675f9e28a73b02"/><file name="courierb.php" hash="a58d7dadf3cf564ca5d5138cea76a3a9"/><file name="courierbi.php" hash="c0e416771dc56cb2397390978d112dc2"/><file name="courieri.php" hash="419961dbeeb20f08da780dccb427dec8"/><file name="helvetica.php" hash="fc53162b924ddd522bd6cfe86fab48f4"/><file name="helveticab.php" hash="4e9ffda682a131fef2e04ccd94aa342d"/><file name="helveticabi.php" hash="6db8943bd91bf13514b82872cf160d45"/><file name="helveticai.php" hash="13b795df0c33eb93c48621792f2ea12d"/><file name="symbol.php" hash="fbd9250c21af99f6398d6f817511f91f"/><file name="times.php" hash="82bc100f1f3bd8b2d9b7fb5ee8f44b3a"/><file name="timesb.php" hash="3a241a1658bf9ea2062e63f464166c31"/><file name="timesbi.php" hash="bfdd0235a71793becefff778c2b16243"/><file name="timesi.php" hash="17fd69f176915a2113fe28057b43a75e"/><file name="zapfdingbats.php" hash="2848ab2daf3128f310b5cf713ca4acee"/></dir><file name="fpdf.css" hash="84befac49464a9aac54aa511bc1fd754"/><file name="fpdf.php" hash="4ebda2283504bfd34b85753433d7e098"/><file name="helvetica.php" hash="fc53162b924ddd522bd6cfe86fab48f4"/><file name="license.txt" hash="fb784726cfe3615da38bc23a3cac445b"/></dir><file name="Fpdf.php" hash="b98f822c8de60fd72c82bd15c92c5a9a"/><dir name="Fpdi"><dir name="filters"><file name="FilterASCII85.php" hash="c6b756ac5874cc6f6f986349b605af64"/><file name="FilterASCII85_FPDI.php" hash="1240e0c64602864401f886546e09fe7b"/><file name="FilterLZW.php" hash="fcba53a4dd3a1f78e62c7aeac726c7b5"/><file name="FilterLZW_FPDI.php" hash="b11c50e66e20744ad20f176cae4af284"/></dir><file name="fpdf_tpl.php" hash="3966b13c398c94509e2fb6199593b104"/><file name="fpdi.php" hash="abb524d17a2cbdd3c3b7e89184aad443"/><file name="fpdi2tcpdf_bridge.php" hash="bcc317cbcfdd3faeae4a1eb480bded0f"/><file name="fpdi_pdf_parser.php" hash="d7a3bf0153ae9ad57976afb0be5d195d"/><file name="pdf_context.php" hash="0b69a25dbb830f3b68c054c2e43b876e"/><file name="pdf_parser.php" hash="5ff22a8c1ce5b1eee82c8017311a797e"/></dir><file name="Fpdi.php" hash="10e45da64b0e05274dc183680fc41988"/></dir></dir></target><target name="magelocale"><dir name="en_US"><dir name="template"><dir name="email"><dir name="TIG"><dir name="PostNL"><file name="return_label.html" hash="7da43daf03b44b0fc218e60e3e3739d6"/><file name="track_and_trace.html" hash="397613160a79d48a5804fa33e577a171"/></dir></dir></dir></dir><file name="TIG_PostNL.csv" hash="4003096c04ebe32242908dcca60985ab"/></dir><dir name="nl_NL"><dir name="template"><dir name="email"><dir name="TIG"><dir name="PostNL"><file name="return_label.html" hash="dc8fd975378f21ec2a821597ae88edc8"/><file name="track_and_trace.html" hash="35b9b68a9c0232fe4e5ea43b138f580e"/></dir></dir></dir></dir><file name="TIG_PostNL.csv" hash="9b7e413976c357a3cfe05a876a53c7d1"/></dir></target><target name="magecommunity"><dir name="TIG"><dir name="PostNL"><dir name="Block"><dir name="AddressValidation"><dir name="GoMage"><dir name="LightCheckout"><file name="Billing.php" hash="9e4dd285bcccdc2c09a98703df8aba8b"/><file name="Shipping.php" hash="f31e5927754e233953f5ee63e3b79fa0"/></dir></dir></dir><dir name="Adminhtml"><dir name="Carrier"><dir name="Postnl"><dir name="Matrixrate"><file name="Grid.php" hash="719cae84112c3c136655489c3491f8d4"/></dir><dir name="Tablerate"><file name="Grid.php" hash="d4047c8f409212e53ad26edd32bf1f80"/></dir></dir></dir><file name="CronNotification.php" hash="8cee9172939b14a2ccea91f848e77a98"/><file name="IntegrityNotification.php" hash="e6975cdea227b1bc901b4a8b6713bd7c"/><file name="LogNotification.php" hash="924dd0bc38a4a9f09294983cce277efa"/><dir name="Sales"><dir name="Items"><dir name="Column"><file name="Qty.php" hash="053e31cba3678520d680772658580f29"/></dir></dir><dir name="Order"><dir name="Create"><dir name="Totals"><file name="CodFee.php" hash="0911e98f34deef84a130b75c6cee2d51"/></dir></dir><dir name="Creditmemo"><dir name="Create"><file name="CodFee.php" hash="465960a4fd4fe538f8933f6571bdea77"/></dir><dir name="Totals"><file name="CodFee.php" hash="464b958112dec88a08daf3c2f72fdc28"/></dir></dir><dir name="Invoice"><dir name="Totals"><file name="CodFee.php" hash="f92fd67e68d2cc83f3352272365f3ca9"/></dir></dir><file name="ProductOptions.php" hash="50183056ec5ea51bcad55333f65ae32b"/><dir name="Shipment"><dir name="Create"><file name="ShipmentOptions.php" hash="d9ba85b04953b426560a2525770c5f4a"/></dir><dir name="View"><file name="DeliveryOptions.php" hash="c5f7f0a2e3b3457568e5dd52c88b71d3"/><file name="ShippingStatus.php" hash="fce062abeff245502b4b1aa438e36e7d"/><dir name="Tab"><file name="StatusHistory.php" hash="47dc64f36b6d0b35acb566ef95f31a5e"/></dir><file name="Tabs.php" hash="7348554a20e28170a8d4a3d16901cb1e"/></dir></dir><dir name="Totals"><file name="CodFee.php" hash="36e884e30294dafaf7cf51d6708e33ee"/></dir><dir name="View"><file name="DeliveryOptions.php" hash="8fc728d30d3521bf405ea761fcb46cb1"/></dir></dir><dir name="Returns"><file name="Grid.php" hash="b8f2c760a91d60ee8f64be58a5482a8c"/></dir><file name="Returns.php" hash="8ddbe0855ea557f1f00236fc88c05aae"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="ActivateButton.php" hash="7accd8c5dece4046b3071250bb976611"/><file name="ActivatedFieldHeader.php" hash="e616a200961dada2718e427b2ff64d39"/><file name="AddressLines.php" hash="cf78339932dfcdfe00cac15f3d8a4d9c"/><file name="Anchor.php" hash="5a20dca71190d8a273425474691c43c1"/><file name="Checkbox.php" hash="124a56f6a5047be8c034fef881c17d03"/><file name="ConfigCheck.php" hash="90cff6426c543dc3d4b0148282754a7a"/><file name="GoMageDeliveryDateConflicts.php" hash="db7d30303c9b5bc38455e61f4cd084c6"/><file name="Hidden.php" hash="4ddc832e13d9d77a7c5f4a3d7128e2cc"/><file name="HourMinute.php" hash="4ebd99406f97313083391348c836098e"/><file name="InfoBox.php" hash="1edb3b7e27ca9655c239852a3a66ae0b"/><file name="MatrixrateExport.php" hash="92a313da8a920266b3f8a1224e1ddd73"/><file name="MatrixrateImport.php" hash="9aaa4ffccfadde72e1a2df9b47a49671"/><file name="Obscure.php" hash="c4ca2e1e738116be5877582212a024f3"/><file name="PackingSlipItemColumns.php" hash="6ac4aed9b10fef8e42150b51df447964"/><file name="PostcodeNlExtensionActive.php" hash="6a84e450066a4b065dd4eecdef8d8df9"/><file name="Radios.php" hash="57fe1ef1a58b5702e49b891ad02ae3fc"/><file name="SplitAddressCheck.php" hash="18b4ac122fdbb436c124e7be5453eddd"/><file name="SupportTab.php" hash="edec65cf3bd2c0e7ec6f472ac6cf104e"/><file name="TablerateExport.php" hash="f9422e88ae49d20e22b52d303ccc4bf8"/><file name="TablerateImport.php" hash="8ef2c6b824a8980f7f8c2b3867c048bf"/><dir name="TextBox"><file name="Abstract.php" hash="79a86dc5182b44267fdf289e0afcc50f"/></dir><dir name="Tooltip"><file name="HourMinute.php" hash="49afc832ba943ae68721287a0cec17d9"/></dir><file name="UninstallButton.php" hash="7e793a5bea3ca2757fa924a070059a76"/><file name="ValidateButton.php" hash="2e807c355c09975ebdcecc95b3122051"/><file name="WarningBox.php" hash="d10d2b6ac7a48fd2b23e098c4e42a1e5"/><file name="WizardSaveButton.php" hash="c3092c8e2ec3217b0e2c64759052a913"/></dir><file name="Fieldset.php" hash="60e2cde58df3bf31c512d3cddecbd7b8"/></dir><file name="Form.php" hash="faea4d8963a40e906fa0e2f75d471999"/><file name="Js.php" hash="fef042173a890a417b379980b04af865"/></dir></dir><file name="Template.php" hash="698d5aba71928360810108ca499f5d46"/><file name="UpgradeNotification.php" hash="3c345025f1dc2baf1c2703339adedee4"/><dir name="Widget"><dir name="Form"><dir name="Element"><file name="Dependence.php" hash="0fa5334c0d152c8500270c11f833548a"/></dir></dir><dir name="Grid"><dir name="Column"><dir name="Filter"><file name="ConfirmDate.php" hash="de9c6cd4eb3b442631538e4760f9be49"/></dir><dir name="Renderer"><file name="Action.php" hash="f9c22f49ccffb03c7a7638af26beb162"/><file name="Barcode.php" hash="2e87137f14a4c9ed6f0352b76c0cec68"/><file name="ConfirmDate.php" hash="bf90b423d7704b85efb8cfcd078308ef"/><file name="ConfirmStatus.php" hash="76c2c59218a7d970aff1db1645c34173"/><file name="CountryArray.php" hash="e49b3b0de079392f59a3676879cffc72"/><file name="DeliveryDate.php" hash="9796d93b7cec0283df89670a37926ed8"/><file name="OrderConfirmDate.php" hash="1395566110233ede6fb8029710e81cb3"/><file name="OrderConfirmStatus.php" hash="baff31b5b2187eb4f45261f6dc2dd98b"/><file name="OrderType.php" hash="b7af6183f916458253db6c714f5ac705"/><file name="ReturnView.php" hash="d95b0b8413c714ebad57773e4f352cbe"/><file name="ShipmentType.php" hash="2589ca78f7f5e4a6a5ca17332c65b646"/><file name="ShippingDescription.php" hash="ccfc24586ed0a5d050173cb7f807f4c7"/><file name="ShippingPhase.php" hash="17bea1345fbad0c6fc0dd0ee8aa9ae42"/><file name="Time.php" hash="380060629ddf255f88f6c7df8532ab8f"/><file name="Translate.php" hash="71a7a828f7c150d03e06be8da97ce0c5"/><dir name="Type"><file name="Abstract.php" hash="2157223c8b025624741de847475e3674"/></dir><file name="YesNo.php" hash="0363dd1204d921d715abff853cf38018"/></dir></dir><dir name="Massaction"><dir name="Item"><dir name="Additional"><file name="LabelStartPos.php" hash="e4f5e368259942adb21b1d9acd241bbf"/><file name="ProductOptions.php" hash="5fb0ac3b749d121d48a90d8b443bc628"/></dir></dir></dir></dir></dir><file name="WindowsTheme.php" hash="32aa198b04a15db89e2d85e8fdb366a5"/></dir><dir name="Checkout"><dir name="Cart"><file name="CheckoutLink.php" hash="95962909faf4ceda468c590dd739d12d"/><file name="Js.php" hash="ae3f3270dbfbe73c7b62e22d289fecc4"/></dir><file name="Summary.php" hash="f29a603b634270c755d9fbb51285bb26"/></dir><dir name="Core"><file name="JsTranslate.php" hash="e5e5c1e1945dde3289e558019afcbf9f"/><dir name="Order"><dir name="Returns"><file name="Info.php" hash="8890bc0b803aa27e0390eb0e5bd04f93"/><dir name="Shipment"><file name="Items.php" hash="227aed060faaa753c8bbac4b4b7ef104"/></dir></dir></dir><file name="ShippingStatus.php" hash="00807b7434dadcb81577a0ec9e406f1f"/><file name="Template.php" hash="9fd7d22e913b32c7c79d3f2353714765"/></dir><dir name="DeliveryOptions"><dir name="Checkout"><file name="AddPhoneNumber.php" hash="487d5e0279d440ecb6872712c7bf0bf6"/><file name="DeliveryOptions.php" hash="4739098834300013c1b92a377785ccac"/><dir name="GoMage"><dir name="LightCheckout"><file name="DeliveryOptions.php" hash="33bc90994ed38e73c893702bf2983cd0"/></dir></dir><file name="Progress.php" hash="ee6b2a989f34c1fbd2888f454e46bd6f"/></dir><file name="Js.php" hash="6986eace90ea7438b0ee7a5dc9062268"/><file name="PickupNotification.php" hash="517caea38f64e87659db08bd33c23b8f"/><file name="Template.php" hash="4a6119be5cde91551052685e59cac196"/><file name="Theme.php" hash="079727a91336d7ee1730daf2187c5a6b"/></dir><dir name="Mijnpakket"><file name="AccountNotification.php" hash="07165d887a985850fbc5b7feaf153d64"/><file name="Js.php" hash="325d49fd161c9b2f6d2aed7b8e26a226"/><file name="LoginButton.php" hash="9b0cb9bbe39943c9a697ba48cbcca03e"/><file name="OrderSuccessJs.php" hash="6184a29c169e32ea435d29179a6a0a61"/></dir><dir name="Payment"><dir name="Checkout"><dir name="Total"><file name="CodFee.php" hash="58c8b076ab42f123dfdd1d62f87a880a"/></dir></dir><dir name="Form"><file name="Cod.php" hash="8830e5ca6c5141f36e5b043e2af8e130"/></dir><file name="Info.php" hash="9c8a8e8eb81459220bf8730f1a01a5ee"/><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><dir name="Totals"><file name="CodFee.php" hash="45dba926b63c26ea2d10eaa9342fa126"/></dir></dir><dir name="Invoice"><dir name="Totals"><file name="CodFee.php" hash="15b6052badbd7cddab9bbf0cf3f28385"/></dir></dir><dir name="Totals"><file name="CodFee.php" hash="60305f5d74bc7a5f70919b0810f5db83"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="AddressValidationController.php" hash="f0cbb3c5eb7a06a7df87b46f12340f7e"/><file name="CheckoutController.php" hash="3cf67af615d9248e3a4c36b3a81aac0f"/><file name="DeliveryOptionsController.php" hash="7186e4451bc5c394da256f8a77a9b7bb"/><file name="GuestController.php" hash="b1fd41520eb6233ea8a592f3ad7f8960"/><file name="MijnpakketController.php" hash="cb21ac1e4a9bd9add17c726e8a4fc8c5"/><file name="OrderController.php" hash="169571ea271e3e8627417cd424265b6f"/><dir name="PostnlAdminhtml"><file name="ConfigController.php" hash="4be0a654b3587c85cfa407a2efdf7ac3"/><file name="ExtensionControlController.php" hash="8b53f7625d0d785012d583431df9b05e"/><file name="ReturnsController.php" hash="8970672c07d50c0db41d9ead77f85685"/><file name="ShipmentController.php" hash="555f97328eb9e3ca55d77f609773aab3"/></dir></dir><dir name="data"><dir name="postnl_setup"><file name="data-install-1.0.0.php" hash="0f6e51ffdb05c34ee375caa6ed04330a"/><file name="data-install-1.0.3.php" hash="e810f0490e9addecdff1e147038505cf"/><file name="data-install-1.1.4.php" hash="679d2f5045221c9e4a5739ceea6aea5d"/><file name="data-install-1.3.0.php" hash="acb1dba6ea2f9d20fab54f4da8d01b1d"/><file name="data-install-1.4.0.php" hash="aa25ceff90a870a56f91b1e1e1535748"/><file name="data-install-1.4.1.php" hash="aa25ceff90a870a56f91b1e1e1535748"/><file name="data-install-1.5.0.php" hash="f6b92b1e6580b4d27ae59bdaa266f12b"/><file name="data-install-1.5.2.php" hash="f6b92b1e6580b4d27ae59bdaa266f12b"/><file name="data-install-1.7.0.php" hash="f6b92b1e6580b4d27ae59bdaa266f12b"/><file name="data-install-1.7.2.php" hash="f6b92b1e6580b4d27ae59bdaa266f12b"/><file name="data-uninstall-1.5.2.php" hash="936bca5a4d83453ba084eae9222063fd"/><file name="data-upgrade-1.1.5-1.2.0.php" hash="d42917000f883909039da268d072f12e"/><file name="data-upgrade-1.2.2-1.3.0.php" hash="081f4fe0da30d8d1f17243044788d891"/><file name="data-upgrade-1.2.2-1.4.0.php" hash="ca609ef0963d214fdc73c2c683b6338d"/><file name="data-upgrade-1.3.1-1.4.0.php" hash="3adec6e1e180139c8736c0e38e3d64d0"/><file name="data-upgrade-1.4.0-1.4.1.php" hash="cc24dfba809a3258814cf736ace125c7"/><file name="data-upgrade-1.4.1-1.5.0.php" hash="07add30edfd0134bc5a1c9c3cc714463"/><file name="data-upgrade-1.5.1-1.5.2.php" hash="0a1c7ca7b337f718b2c94ffe6fd9e31d"/><file name="data-upgrade-1.6.0-1.6.1.php" hash="e7703a1946197f942e18d580315e1271"/><file name="data-upgrade-1.6.1-1.7.0.php" hash="4e77adb10d70f54ae7f2e38d4abcfe7a"/><file name="data-upgrade-1.7.1-1.7.2.php" hash="23969f2d9568c6cf032d71c15bed28b4"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="56189634cdb92603e2b7c1bb7992b9f2"/><file name="api.xml" hash="06c70ddaedf5f1d80e5f00fed36861b9"/><file name="config.xml" hash="420eabe8c6e9584d3bbda828c96d157e"/><file name="jstranslator.xml" hash="9f4009071fae30e8672c30eb025aa05f"/><file name="logging.xml" hash="ce5204eedfeff521a06a23d6879e0b1c"/><file name="system.xml" hash="d1af018d324b57a32e38dc23471d29eb"/><file name="wsdl.xml" hash="21b79f48351ea629cff7d17c8f65c4ee"/><file name="wsi.xml" hash="ac2aada1c17a03519e02fa7ef93e49ca"/></dir><dir name="Helper"><file name="AddressValidation.php" hash="ba4945afa4f4dc1c33e7efdf87b74fe6"/><file name="Adminhtml.php" hash="948ab2c69eaf1097a52c2a9d5ab44852"/><file name="Carrier.php" hash="ffbcf8554493fa065cc3322ac39ced82"/><file name="Checkout.php" hash="4e6942292f35f9eeb0e8d0788b5eb4e4"/><file name="Cif.php" hash="acfbfc48640c184c7a0141f14e375a4b"/><file name="Data.php" hash="3238839b3db31d1cb53be78b94efec20"/><file name="Date.php" hash="ca7c80f1f91bea3c4df0f7e91344e890"/><dir name="DeliveryOptions"><file name="Fee.php" hash="0bea0d72d07f67e4e81eff2d9cd20460"/></dir><file name="DeliveryOptions.php" hash="54f4b11254eabafdda76effbd565fdc8"/><file name="Mijnpakket.php" hash="4e2868c2420ed3ae04f6aa39f1491fd6"/><file name="Parcelware.php" hash="186b41ea5ff5f95f27eee2bdcdc2e554"/><file name="Payment.php" hash="654932a980a34c58fd5b5854ebbf13a8"/><file name="Webservices.php" hash="ed9834c4bb7afa088701c894590e40eb"/></dir><dir name="Model"><dir name="AddressValidation"><dir name="Cendris"><file name="Abstract.php" hash="50c033ec698cede75909218c10407a51"/></dir><file name="Cendris.php" hash="e1f6c7f6b2a3cba3cc7b0202b1112588"/><dir name="Observer"><file name="AddressBook.php" hash="500df77a7d02b3e2beab105f70491d29"/><file name="OneStepCheckout.php" hash="881144684006dee7fd19f3a1ceafda0e"/><file name="Onepage.php" hash="15dce59c220b464341341d9607c7a15b"/></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="ValidateAccount.php" hash="93e274a7a9d51d180eebcf534c3278ae"/></dir></dir></dir></dir><dir name="Admin"><file name="Inbox.php" hash="ec5296dc861d31e076f68e15f50b8fa3"/><dir name="Logging"><dir name="Handler"><file name="Postnl.php" hash="31fbf47d57353dcf649323b627fad31a"/></dir><file name="Observer.php" hash="245c653d116e4af74bd03fb71b9842e9"/></dir></dir><dir name="Adminhtml"><dir name="Form"><dir name="Element"><file name="Checkbox.php" hash="1d1d599f8f77e689cd99b0a56406c658"/></dir></dir><dir name="Observer"><file name="OrderGrid.php" hash="8ce4ea25933918149e85cb0c03e789a9"/><file name="ShipmentGrid.php" hash="27d639a9e2a84151fd7deef0a282c6d1"/><file name="ShipmentView.php" hash="b98b741eb1baca0c91a47427873281d3"/><file name="SystemConfig.php" hash="2b230b2332ca8624e702ea2873a4d28f"/></dir><dir name="Support"><file name="Logs.php" hash="9015b88009cd9fe4272f7e1c515a3c1e"/></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="OrderGridColumns.php" hash="43b606fb5126a37deb932323776ed018"/><file name="OrderGridMassaction.php" hash="fbe0d93e489c33dee7ac78e2b46f71ce"/><file name="ShipmentGridColumns.php" hash="0f454ed444c2b336b679851ba4628315"/><file name="ShipmentGridMassaction.php" hash="cc0020d8889bd2b3b882e1239ca3a5d3"/></dir></dir></dir></dir><dir name="Carrier"><file name="Matrixrate.php" hash="06770348fd20799930fde401f4f13f36"/><file name="Postnl.php" hash="c4801d611a7a355fe6c7922ae9ef8783"/><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Shipping.php" hash="514f8b23118b99fcda2f9c9c03869c0e"/></dir></dir></dir><dir name="Resource"><dir name="Matrixrate"><file name="Collection.php" hash="2a1c138a047d05d8e6c60ab6f72b7513"/></dir><file name="Matrixrate.php" hash="32521fef38856bd278e007106a8302f8"/><dir name="Tablerate"><file name="Collection.php" hash="6e88398632a25d1e2764077baeb2bc34"/></dir><file name="Tablerate.php" hash="0c1accf31df8fea3b5957c3ec153e04e"/></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Matrixrate.php" hash="b577a98aaf72c2d257b70c90fe3359b7"/><file name="Tablerate.php" hash="350d5ad8dbc4642c57ce43f09b2f0abb"/></dir><dir name="Source"><file name="RateType.php" hash="bf48a14786d0c082c77e5030569e722e"/><file name="TablerateSource.php" hash="c6db35abf67e414753170899e6a32574"/></dir></dir></dir><file name="Tablerate.php" hash="f04830fdd0204e77fd3722a3126e053f"/></dir><dir name="Checkout"><file name="Cif.php" hash="7ccfe830d1014b72dcc4cde189ababeb"/><dir name="Observer"><file name="Order.php" hash="9bc4e68ff3aa044d354a8cfd7c6d2973"/><file name="Shipment.php" hash="d1476ec8b026526652944578f3cdc6e0"/></dir><file name="Order.php" hash="4a6595b1d38ee5e9bb59121217c7d7ec"/><file name="Service.php" hash="643115d26dd7d0fbb0403201821a0d22"/><dir name="System"><dir name="Config"><dir name="Source"><file name="ActivePaymentMethods.php" hash="25641b223a79ae37ef3748b5bcb8ff10"/><file name="CmsPage.php" hash="9fc61473b5b3ad4692c694b0090020d0"/></dir></dir></dir></dir><dir name="Core"><dir name="Api"><file name="V2.php" hash="fcc859d18412537c16dd5a05048fe389"/></dir><file name="Api.php" hash="5713490c5a033f2feb92944cbe710643"/><file name="Cache.php" hash="6ac64a62771b5a149b2069bbcb207027"/><dir name="Cif"><file name="Abstract.php" hash="0a153e5528029d7ab14c7c3d2bbadb69"/><file name="Exception.php" hash="bc208a7f87f76017f95367791b5a757a"/></dir><file name="Cif.php" hash="0a4940a4129552676f2e5a99fbe49d2d"/><file name="Label.php" hash="0688332a449a391ae1d8479f613840b5"/><dir name="Observer"><file name="Barcode.php" hash="ad88f42dae63a5026175ad48c9867496"/><file name="Cache.php" hash="069ebcbb34d8374da85f5215dd62b64c"/><file name="Cron.php" hash="5b2624ed83115b047649d2bc328a8438"/><file name="Returns.php" hash="615e291be056343d1b6c2315973ef923"/><file name="SaveShipment.php" hash="a5d68c8d535bd223446eb266be27c64c"/></dir><file name="Order.php" hash="45306091a47ec9ef89c00b9dfb6c90ef"/><file name="PackingSlip.php" hash="6591be1dfda7a99d1b235e178bfd7e3c"/><dir name="Packingslip"><dir name="Pdf"><dir name="Items"><dir name="Invoice"><file name="Default.php" hash="bcc11102dd46f50b24ab638272f08bec"/></dir></dir></dir></dir><dir name="Resource"><dir name="Integrity"><file name="Collection.php" hash="801fef1fa85ce429ad6a183c047d2f30"/></dir><file name="Integrity.php" hash="02fda656ed92340c0cd9ed04cdf4e021"/><dir name="Order"><file name="Collection.php" hash="7833da8c9b02253fa34b3a7f0dfac065"/></dir><file name="Order.php" hash="dc95e51a1246ab1c11edc208fc7033b1"/><dir name="Shipment"><dir name="Barcode"><file name="Collection.php" hash="5b52ea9f06abffc9d3f43a102faf9b66"/></dir><file name="Barcode.php" hash="866e9b9fba53b6b92b91cdee9f54be9d"/><file name="Collection.php" hash="5615baafe4dd845657ad770b9bd20960"/><dir name="Label"><file name="Collection.php" hash="a1db2bb6a3c928a8e5b3ab369a46e49d"/></dir><file name="Label.php" hash="0fb2575b876d9afa43506ef673a07890"/><dir name="Status"><dir name="History"><file name="Collection.php" hash="2a7f814cf8272411106b82290dbe986a"/></dir><file name="History.php" hash="e0b88660d2f70dbb64931267e356887f"/></dir></dir><file name="Shipment.php" hash="aed109e5357ab39a8b787da35cd8adf1"/></dir><dir name="Service"><file name="IntegrityCheck.php" hash="8018c9670c0628cbcffb5a016d69024e"/><file name="InvoiceDummy.php" hash="44685782fb45d538e52fa55af499a98d"/><file name="OrderDummy.php" hash="692f3dbd80474a91e94260b2d7a36093"/><file name="PaymentDummy.php" hash="cbf5cc5602001b04773cbca56638f6ff"/><file name="PaymentMethodDummy.php" hash="fb6c9d1ff9476a7837b12bb2b182deab"/><file name="Shipment.php" hash="ed78a6f67553fdf2d7fe4189506da367"/></dir><file name="Service.php" hash="efbc3d15489140ca6467601470bc2677"/><dir name="Shipment"><file name="Barcode.php" hash="d832ccbc623866dc4734569bc10904bd"/><file name="Label.php" hash="4d0461336cf868106182be18f0715ecf"/><file name="Process.php" hash="454eb8c38d17cd9adbf966a4b14e8ba6"/><dir name="Status"><file name="History.php" hash="4eb1d2b51250ed211c8d9a3daee7eab5"/></dir></dir><file name="Shipment.php" hash="fdef9208d89deb2842c989ba4da09c92"/><dir name="System"><dir name="Config"><dir name="Backend"><file name="HourMinute.php" hash="554a64b90a144a2befd5b08910415fe8"/><dir name="Image"><file name="Pdf.php" hash="4bea24f4e50dbed7656cbb16a026b030"/></dir><file name="SenderCountry.php" hash="3babb54a85ee385ced4f7c8ecab9e2ec"/><file name="ValidateDefaultOption.php" hash="13fd85e0856fa4727dd8fd48280497bb"/></dir><dir name="Source"><file name="AllProductOptions.php" hash="bd023a7e9b602669e7069ebc3b71bb84"/><file name="Attributes.php" hash="2473c5ea43dc870d0fc8c9ca65ce114f"/><file name="BuspakjeProductOptions.php" hash="61160df0a489706d8aaf667824a4667a"/><file name="CheckoutExtensions.php" hash="11a6a8677dc17953aad9bed4d3255e9e"/><file name="CommentType.php" hash="45f7d07778d18d65985aa27a96bc6435"/><file name="CutOffTime.php" hash="81cee271d87bcfea0e00743a8c0890d8"/><file name="DebugMode.php" hash="523dcaf9a609ac98394fd2b2c08d671f"/><file name="Direction.php" hash="311ab3017a41f2e2b74546f908580e1d"/><file name="EuProductOptions.php" hash="82b22e6dd7216b906ddd75acf1455cd8"/><file name="GlobalProductOptions.php" hash="55a47c89eb97f2818d197c15fd8f75da"/><file name="GlobalpackShipmentType.php" hash="671b24f7531e28a5bdcdae6af132c0a6"/><file name="HourMinute.php" hash="94a06e8e207905706a1dc5f659d1763a"/><file name="LabelSize.php" hash="47c7df3c8be3c4cbc18a9ef3657bfa80"/><file name="ManualAutomatic.php" hash="33e2dc23ad7c1cec65ed399eb503ae2c"/><file name="PackingSlipItemFields.php" hash="8996461b8aa59c4ca4f665f6efc0046b"/><file name="PackingSlipLabel.php" hash="79671ca1c255f5fbdf775598f30a4b7a"/><file name="PakjeGemakProductOptions.php" hash="8ac50f9b9fc670f1112e126f6ce3628a"/><file name="PakketautomaatProductOptions.php" hash="21fd7ca0391391ec70646e8210d0d9b3"/><dir name="ProductOptions"><file name="Abstract.php" hash="4461133cd5af333c4d254c2f65b05821"/></dir><file name="ReferenceType.php" hash="4f404910f2989464e5b107e15be0c0eb"/><file name="SenderCountry.php" hash="fcba64b64dd4fe76230bbad825ec975e"/><file name="ShippingDays.php" hash="185cd2b5e5fcdc380fb607591b054a3e"/><file name="ShippingDuration.php" hash="1aa01df7274c360143fb0b2963ce9e68"/><file name="ShippingDurationDays.php" hash="72bc6233794480e08f62561d0aa118c7"/><file name="ShippingMethods.php" hash="5779b9e9c9af5cb2c6a5d25b761227b0"/><file name="StandardProductOptions.php" hash="45050efb0140487a56df485a138d97da"/><file name="StaticBlocks.php" hash="1c3d2fc026d1afc7a7108b61e76828b7"/><file name="StreetField.php" hash="80123df69368755513c4341306bd2065"/><file name="StreetFieldWithDefault.php" hash="bac4f43be478165ca454d2423f611a77"/><file name="SundayProductOptions.php" hash="22130290e3e05b703e77a0206941c78d"/><file name="WeightUnit.php" hash="b6bbe9c7c8c2ae76d991963a3f44cd99"/></dir></dir></dir></dir><dir name="DeliveryOptions"><file name="Cif.php" hash="54ac1692bd35301f4c9f3fada543e5e1"/><dir name="Observer"><dir name="GoMage"><dir name="LightCheckout"><file name="Ajax.php" hash="12682d1c78338fbae4ee9739f5096983"/></dir></dir><file name="ShippingMethodAvailable.php" hash="2ad9bf64aee177805a321653610e198f"/><file name="UpdatePostnlOrder.php" hash="87fcabd21b9f1191b9f0e968ea765cd5"/></dir><dir name="Product"><dir name="Attribute"><dir name="Source"><file name="ShippingDuration.php" hash="90349cc22cb674e66ab781a306edf254"/></dir></dir></dir><file name="Service.php" hash="0bf672ab839bda360794c74b7132552e"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="ValidateFee"><file name="SundayDeliveryFee.php" hash="a08f2591640c8536ce62b14759f7388b"/></dir><file name="ValidateFee.php" hash="e9be068f77d2c30c9b8ccec5d08c9de2"/></dir><dir name="Source"><file name="DeliveryDaysNumber.php" hash="1d8efcdf01df2d64f526c9252d1f7b0b"/><file name="StockOptions.php" hash="441c9cefc7338910a2945757f7842366"/><file name="Themes.php" hash="9b9e2ea217313bbc4b426dfa04f74f66"/></dir></dir></dir></dir><dir name="ExtensionControl"><file name="Config.php" hash="f8c7c6f3861226a4b7be138f2931c6d2"/><file name="Feed.php" hash="f4a9f3a94304e2b0232ce7bd6a387d5a"/><dir name="Observer"><file name="Cron.php" hash="4c6cb0450d529f262fc6fd8291b672de"/></dir><dir name="Webservices"><file name="Abstract.php" hash="c76ee8ce49daf8d196831de07c7cd669"/></dir><file name="Webservices.php" hash="b8fbe739eba545e6e69d3dd9b82aca01"/></dir><file name="Inbox.php" hash="7b8a986f8015a7b02bda5dd8a62ec142"/><dir name="Mijnpakket"><file name="Cif.php" hash="1b3aee253fd6774eee7e2ff0e16735d3"/><file name="Service.php" hash="8d077e3ec1ab1da2f7546c9164d19fc6"/></dir><dir name="Parcelware"><file name="Export.php" hash="8376fb5198cebb9c37f748cb10b723a9"/></dir><dir name="Payment"><file name="Cod.php" hash="1896567a30f70f073ec90ee93a4cca98"/><dir name="Observer"><file name="Cod.php" hash="babbb29d7bd51962c0a421a4162806b6"/></dir><dir name="Order"><dir name="Creditmemo"><dir name="Total"><dir name="CodFee"><file name="Abstract.php" hash="d094101edbd45da5014d8da7596aeb42"/></dir><file name="CodFee.php" hash="61649dc792fef11e833d6a6438fb4bd3"/><file name="CodFeeTax.php" hash="2e171923277c33a239e4f0c3eadb3d98"/></dir></dir><dir name="Invoice"><dir name="Total"><file name="CodFee.php" hash="1fba67d2cfbfd26a0a253ca9e83e7f55"/><file name="CodFeeTax.php" hash="a16e2216e8f156edb316fa4d3acdcf65"/><file name="Subtotal.php" hash="4d93dbab0e57076404275983d7ecefb6"/></dir></dir><dir name="Pdf"><dir name="Total"><file name="CodFee.php" hash="73eddd5e61452a2e018dfa6af3c1464b"/><file name="Grandtotal.php" hash="f9baa2ba4d712cbe6ed677d95aaa8a0e"/><file name="Tax.php" hash="5685ecae76e17277736901942f851452"/></dir></dir></dir><dir name="Quote"><dir name="Address"><dir name="Total"><dir name="CodFee"><file name="Abstract.php" hash="183493f74e29e0f01a6550c3cceb07bd"/></dir><file name="CodFee.php" hash="9c6d0e1695f274c06b1d6ecbc41a74cd"/><file name="CodFeeTax.php" hash="227ab37a8fa18162093257bca9235151"/></dir></dir></dir><file name="Service.php" hash="7b2e6ceb6c167bb55cca7b472206cb47"/><dir name="System"><dir name="Config"><dir name="Source"><file name="CodFeeTaxClass.php" hash="44551d5944906bbc3d3228131324b84c"/></dir></dir></dir></dir><dir name="Resource"><dir name="Catalog"><file name="Product.php" hash="42e4000e43176e1d6ee4336781478673"/></dir><dir name="Db"><file name="Abstract.php" hash="5abcdd8977c7000f81157991be5e4254"/><dir name="Collection"><file name="Postnl.php" hash="6d58f3700831f61c51f711f64684b09b"/></dir></dir><dir name="Order"><dir name="Grid"><file name="Collection.php" hash="9014651adaab7bce2b670dba10d97b62"/></dir><dir name="Shipment"><dir name="Grid"><file name="Collection.php" hash="3d1f13f598acbaa561a36f1a91882064"/></dir></dir><file name="Shipment.php" hash="8b9f972ad5b3ae1ccd3a7721ee347120"/></dir><file name="Setup.php" hash="8198bc3b5d48502ba7361bbbbeef3fcb"/></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Checkbox.php" hash="0406128f26b82124d3b9ac698dfa8b09"/></dir><dir name="Source"><file name="Testlive.php" hash="ddd6fab7b721c4776355c5970df35716"/><file name="Yesno.php" hash="eed431ec0c66f961063b71f7150d8c20"/></dir></dir></dir></dir><dir name="sql"><dir name="postnl_setup"><file name="install-1.0.0.php" hash="0dc89283fefae06eda154b0d24dc01f9"/><file name="upgrade-1.1.5-1.2.0.php" hash="2881d8847c87c32ebfb5803f436cf024"/><file name="upgrade-1.2.2-1.3.0.php" hash="157203a83d21987b05088e2dc826bbc5"/><file name="upgrade-1.3.1-1.4.0.php" hash="5aaa53a0ae8eb13e746f8653f8d3ace1"/><file name="upgrade-1.4.1-1.5.0.php" hash="e1dcb902c674cb23072383b2872e554a"/></dir></dir><file name="Exception.php" hash="4e387d54ace504eb1a3e9dcf683283fa"/><dir name="Controller"><dir name="Adminhtml"><file name="Abstract.php" hash="3a9c4368b6341595a54d0f42674b9d46"/><file name="Config.php" hash="48248ae95f4f8d598c6505cc8555058b"/><file name="Shipment.php" hash="66b4938de6b9c8c2918d3ef6288c5114"/></dir><file name="Sales.php" hash="cb8ae934de6a38903e8ccfc76acf79bd"/></dir><dir name="docs"><file name="modman" hash="1af20fda3c00366cd3bce971af94ec54"/></dir></dir></dir></target></contents>
|
| 445 |
<compatible/>
|
| 446 |
<dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php></required></dependencies>
|
| 447 |
</package>
|
skin/frontend/base/default/js/TIG/PostNL/deliveryOptions.js
CHANGED
|
@@ -239,7 +239,9 @@ PostnlDeliveryOptions.prototype = {
|
|
| 239 |
postnlShippingMethods : [
|
| 240 |
's_method_postnl_tablerate', 's_method_postnl_flatrate'
|
| 241 |
],
|
| 242 |
-
extraOptions : {}
|
|
|
|
|
|
|
| 243 |
}, options || {});
|
| 244 |
|
| 245 |
this.debug = debug;
|
|
@@ -773,6 +775,7 @@ PostnlDeliveryOptions.prototype = {
|
|
| 773 |
deliveryDate = this.getDeliveryDate();
|
| 774 |
}
|
| 775 |
|
|
|
|
| 776 |
this.timeframeRequest = new Ajax.PostnlRequest(this.getTimeframesUrl(), {
|
| 777 |
method : 'post',
|
| 778 |
parameters : {
|
|
@@ -786,7 +789,9 @@ PostnlDeliveryOptions.prototype = {
|
|
| 786 |
onFailure : this.showDefaultTimeframe.bind(this),
|
| 787 |
onComplete : function() {
|
| 788 |
this.timeframeRequest = false;
|
| 789 |
-
}.bind(this)
|
|
|
|
|
|
|
| 790 |
});
|
| 791 |
|
| 792 |
return this;
|
|
@@ -914,6 +919,27 @@ PostnlDeliveryOptions.prototype = {
|
|
| 914 |
if (selectTimeframe) {
|
| 915 |
this.saveSelectedOption();
|
| 916 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 917 |
}
|
| 918 |
|
| 919 |
if (this.debug) {
|
|
@@ -973,6 +999,7 @@ PostnlDeliveryOptions.prototype = {
|
|
| 973 |
}
|
| 974 |
}
|
| 975 |
|
|
|
|
| 976 |
this.locationsRequest = new Ajax.PostnlRequest(this.getLocationsUrl(),{
|
| 977 |
method : 'post',
|
| 978 |
parameters : {
|
|
@@ -986,7 +1013,9 @@ PostnlDeliveryOptions.prototype = {
|
|
| 986 |
onFailure : this.hideLocations.bind(this),
|
| 987 |
onComplete : function() {
|
| 988 |
this.locationsRequest = false;
|
| 989 |
-
}.bind(this)
|
|
|
|
|
|
|
| 990 |
});
|
| 991 |
|
| 992 |
return this;
|
|
@@ -4092,7 +4121,7 @@ PostnlDeliveryOptions.Location = new Class.create({
|
|
| 4092 |
headerHtml += '<div class="content">';
|
| 4093 |
headerHtml += '<a href="#" title="'
|
| 4094 |
+ Translator.translate('Show on the map')
|
| 4095 |
-
+ '" class="show-map" id="show_map_'
|
| 4096 |
+ this.getLocationCode()
|
| 4097 |
+ '">';
|
| 4098 |
headerHtml += '<strong class="location-name overflow-protect">' + this.getName() + '</strong>';
|
|
@@ -5163,6 +5192,9 @@ PostnlDeliveryOptions.Timeframe = new Class.create({
|
|
| 5163 |
case 'Sunday' :
|
| 5164 |
this.type = 'Sunday';
|
| 5165 |
break;
|
|
|
|
|
|
|
|
|
|
| 5166 |
default :
|
| 5167 |
this.type = 'Overdag';
|
| 5168 |
break;
|
|
@@ -5361,6 +5393,10 @@ PostnlDeliveryOptions.Timeframe = new Class.create({
|
|
| 5361 |
comment = '<span class="option-comment">' + Translator.translate('sunday') + sundayCostHtml + '</span>';
|
| 5362 |
}
|
| 5363 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 5364 |
return comment;
|
| 5365 |
},
|
| 5366 |
|
|
@@ -5426,4 +5462,4 @@ PostnlDeliveryOptions.Timeframe = new Class.create({
|
|
| 5426 |
|
| 5427 |
return this;
|
| 5428 |
}
|
| 5429 |
-
});
|
| 239 |
postnlShippingMethods : [
|
| 240 |
's_method_postnl_tablerate', 's_method_postnl_flatrate'
|
| 241 |
],
|
| 242 |
+
extraOptions : {},
|
| 243 |
+
getLocationsTimeout : 5,
|
| 244 |
+
getTimeframesTimeout : 5
|
| 245 |
}, options || {});
|
| 246 |
|
| 247 |
this.debug = debug;
|
| 775 |
deliveryDate = this.getDeliveryDate();
|
| 776 |
}
|
| 777 |
|
| 778 |
+
var options = this.getOptions();
|
| 779 |
this.timeframeRequest = new Ajax.PostnlRequest(this.getTimeframesUrl(), {
|
| 780 |
method : 'post',
|
| 781 |
parameters : {
|
| 789 |
onFailure : this.showDefaultTimeframe.bind(this),
|
| 790 |
onComplete : function() {
|
| 791 |
this.timeframeRequest = false;
|
| 792 |
+
}.bind(this),
|
| 793 |
+
onTimeout : this.showDefaultTimeframe.bind(this),
|
| 794 |
+
timeoutDelay: options.getTimeframesTimeout
|
| 795 |
});
|
| 796 |
|
| 797 |
return this;
|
| 919 |
if (selectTimeframe) {
|
| 920 |
this.saveSelectedOption();
|
| 921 |
}
|
| 922 |
+
|
| 923 |
+
var fullAddressArray = this.fullAddress.split(',');
|
| 924 |
+
|
| 925 |
+
var useBillingForShipping = true;
|
| 926 |
+
if ($('billing:use_for_shipping_yes')) {
|
| 927 |
+
useBillingForShipping = $('billing:use_for_shipping_yes').getValue();
|
| 928 |
+
} else if ($('billing_use_for_shipping_yes')) {
|
| 929 |
+
useBillingForShipping = $('billing_use_for_shipping_yes').getValue();
|
| 930 |
+
}
|
| 931 |
+
|
| 932 |
+
if (fullAddressArray[0] == '') {
|
| 933 |
+
if(useBillingForShipping == 1) {
|
| 934 |
+
var street = $('virtual:billing:street1').getValue();
|
| 935 |
+
var houseNr = $('virtual:billing:street2').getValue();
|
| 936 |
+
} else {
|
| 937 |
+
var street = $('virtual:shipping:street1').getValue();
|
| 938 |
+
var houseNr = $('virtual:shipping:street2').getValue();
|
| 939 |
+
}
|
| 940 |
+
|
| 941 |
+
$$('.postnl-container #postnl_add_moment .location-name')[0].update(street + ' ' + houseNr);
|
| 942 |
+
}
|
| 943 |
}
|
| 944 |
|
| 945 |
if (this.debug) {
|
| 999 |
}
|
| 1000 |
}
|
| 1001 |
|
| 1002 |
+
var options = this.getOptions();
|
| 1003 |
this.locationsRequest = new Ajax.PostnlRequest(this.getLocationsUrl(),{
|
| 1004 |
method : 'post',
|
| 1005 |
parameters : {
|
| 1013 |
onFailure : this.hideLocations.bind(this),
|
| 1014 |
onComplete : function() {
|
| 1015 |
this.locationsRequest = false;
|
| 1016 |
+
}.bind(this),
|
| 1017 |
+
onTimeout : this.hideLocations.bind(this),
|
| 1018 |
+
timeoutDelay: options.getLocationsTimeout
|
| 1019 |
});
|
| 1020 |
|
| 1021 |
return this;
|
| 4121 |
headerHtml += '<div class="content">';
|
| 4122 |
headerHtml += '<a href="#" title="'
|
| 4123 |
+ Translator.translate('Show on the map')
|
| 4124 |
+
+ '" class="show-map overflow-protect" id="show_map_'
|
| 4125 |
+ this.getLocationCode()
|
| 4126 |
+ '">';
|
| 4127 |
headerHtml += '<strong class="location-name overflow-protect">' + this.getName() + '</strong>';
|
| 5192 |
case 'Sunday' :
|
| 5193 |
this.type = 'Sunday';
|
| 5194 |
break;
|
| 5195 |
+
case 'Monday' :
|
| 5196 |
+
this.type = 'Monday';
|
| 5197 |
+
break;
|
| 5198 |
default :
|
| 5199 |
this.type = 'Overdag';
|
| 5200 |
break;
|
| 5393 |
comment = '<span class="option-comment">' + Translator.translate('sunday') + sundayCostHtml + '</span>';
|
| 5394 |
}
|
| 5395 |
|
| 5396 |
+
if (this.type == 'Monday') {
|
| 5397 |
+
comment = '<span class="option-comment">' + '</span>';
|
| 5398 |
+
}
|
| 5399 |
+
|
| 5400 |
return comment;
|
| 5401 |
},
|
| 5402 |
|
| 5462 |
|
| 5463 |
return this;
|
| 5464 |
}
|
| 5465 |
+
});
|
skin/frontend/base/default/js/TIG/PostNL/postcodecheck.js
CHANGED
|
@@ -95,22 +95,28 @@ PostnlPostcodecheck = new Class.create({
|
|
| 95 |
}
|
| 96 |
|
| 97 |
var postcodeCheck = this;
|
| 98 |
-
$(countryField).observe('change', function() {
|
| 99 |
-
countryId = this.getValue();
|
| 100 |
|
| 101 |
-
|
| 102 |
-
$('postnl_address_missing_' + addressType).hide();
|
| 103 |
-
$('postnl_address_invalid_' + addressType).hide();
|
| 104 |
|
| 105 |
-
|
|
|
|
| 106 |
|
| 107 |
-
|
| 108 |
-
|
| 109 |
-
|
| 110 |
|
| 111 |
-
postcodeCheck.
|
| 112 |
-
|
| 113 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 114 |
|
| 115 |
$(postcodeField).observe('change', function() {
|
| 116 |
var postcode = this.getValue();
|
| 95 |
}
|
| 96 |
|
| 97 |
var postcodeCheck = this;
|
|
|
|
|
|
|
| 98 |
|
| 99 |
+
if($(countryField) === null || $(countryField).hasClassName('country_hidden') == false) {
|
|
|
|
|
|
|
| 100 |
|
| 101 |
+
$(countryField).observe('change', function() {
|
| 102 |
+
countryId = this.getValue();
|
| 103 |
|
| 104 |
+
$('postnl_address_error_' + addressType).hide();
|
| 105 |
+
$('postnl_address_missing_' + addressType).hide();
|
| 106 |
+
$('postnl_address_invalid_' + addressType).hide();
|
| 107 |
|
| 108 |
+
postcodeCheck.changePostcodeCheckDisabledFields(countryId);
|
| 109 |
+
|
| 110 |
+
if (countryId == 'NL') {
|
| 111 |
+
postcode = $(postcodeField).getValue();
|
| 112 |
+
housenumber = $(virtualPrefix + housenumberField).getValue();
|
| 113 |
+
|
| 114 |
+
postcodeCheck.checkPostcode(postcode, housenumber);
|
| 115 |
+
}
|
| 116 |
+
});
|
| 117 |
+
} else {
|
| 118 |
+
countryField = 'billing:country_id';
|
| 119 |
+
}
|
| 120 |
|
| 121 |
$(postcodeField).observe('change', function() {
|
| 122 |
var postcode = this.getValue();
|
