From c7534fd58ffe167680842473e84ce1f78288e005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Vracovsk=C3=BD?= <vracovsky@shoptet.cz>
Date: Tue, 2 Feb 2021 07:09:48 +0100
Subject: [PATCH] Refactored checkout for 3rd generation templates

---
 00/css/modules/components/forms.less          |   13 -
 00/css/modules/components/order-step-one.less |   34 +-
 00/css/modules/components/price-wrapper.less  |    4 -
 00/css/modules/shared-declarations.less       |   10 +-
 00/js/jqueryui/autocomplete.js                | 1215 +++++++++--------
 00/js/libs/cart.js                            |   22 +-
 00/js/libs/checkout.js                        |  797 +----------
 00/js/libs/checkoutShared.js                  |  876 ++++++++++++
 00/js/libs/config.js                          |   16 -
 00/js/libs/externalShippingOne.js             |   92 ++
 00/js/libs/externalShippingTwo.js             |   92 ++
 00/js/libs/helpers.js                         |    9 +-
 00/js/libs/modal.js                           |   28 +-
 00/js/libs/scripts.js                         |   31 +-
 00/js/modules/globalFunctions.js              |   28 +-
 09/css/modules/cart.less                      |    4 -
 16 files changed, 1785 insertions(+), 1486 deletions(-)
 create mode 100644 00/js/libs/checkoutShared.js
 create mode 100644 00/js/libs/externalShippingOne.js
 create mode 100644 00/js/libs/externalShippingTwo.js

diff --git a/00/css/modules/components/forms.less b/00/css/modules/components/forms.less
index ab03966..7293fdd 100644
--- a/00/css/modules/components/forms.less
+++ b/00/css/modules/components/forms.less
@@ -154,9 +154,6 @@ input[type="radio"] {
             cursor: not-allowed;
         }
     }
-    .table-payu & {
-        display: inline;
-    }
     &.error-field,
     &.js-error-field {
         & + label {
@@ -218,16 +215,6 @@ input {
     &[type="search"] {
         .appearance(none);
     }
-    &[type="radio"] {
-        .table-payu & {
-            .appearance(radio);
-        }
-    }
-    &[type="checkbox"] {
-        .table-payu & {
-            .appearance(checkbox);
-        }
-    }
 }
 
 .required-asterisk:after {
diff --git a/00/css/modules/components/order-step-one.less b/00/css/modules/components/order-step-one.less
index 6d6064d..e80d75e 100644
--- a/00/css/modules/components/order-step-one.less
+++ b/00/css/modules/components/order-step-one.less
@@ -6,12 +6,6 @@
     &:last-child {
         border-bottom-style: none;
     }
-    &.payu-billing-info {
-        padding-left: 0;
-        label {
-            padding-left: 20px;
-        }
-    }
     input[type="radio"] + label {
         display: flex;
         justify-content: space-between;
@@ -58,16 +52,20 @@
     }
 }
 
-#payu-template {
-    .container {
-        width: auto;
-        padding-left: 0;
-        padding-right: 0;
-        padding: round(@line-height-computed / 2) 0;
-    }
-    table {
-        max-width: 100%;
-        width: 100% !important;
-        margin: 0 !important;
-    }
+#payu_ .table-payu {
+    border: 0 !important;
+    width: 100% !important;
+    max-width: 100%;
+    padding: 0 !important;
+    margin: 0 !important;
+    background: none !important;
+}
+
+input[type="radio"].payu + label::before,
+input[type="radio"].payu + label::after {
+    visibility: hidden;
+}
+#payu_ input[type="radio"] {
+    display: inline;
+    .appearance(auto);
 }
diff --git a/00/css/modules/components/price-wrapper.less b/00/css/modules/components/price-wrapper.less
index cb938bf..3e1a33e 100644
--- a/00/css/modules/components/price-wrapper.less
+++ b/00/css/modules/components/price-wrapper.less
@@ -36,7 +36,3 @@
         }
     }
 }
-
-.matrixprice {
-    display: none;
-}
diff --git a/00/css/modules/shared-declarations.less b/00/css/modules/shared-declarations.less
index b9f7eed..1f4efe2 100644
--- a/00/css/modules/shared-declarations.less
+++ b/00/css/modules/shared-declarations.less
@@ -233,11 +233,6 @@ label.disabled {
         width: auto !important;
         padding: 0 !important;
     }
-    .table-payu {
-        width: 100% !important;
-        margin: 10px 0 !important;
-        padding: 0 !important;
-    }
     #checkoutContent & {
         display: block;
     }
@@ -373,7 +368,6 @@ iframe[name="google_conversion_frame"] {
 #company-info {
     margin-bottom: @line-height-computed;
 }
-
 /* social buttons popoup */
 .at-share-dock-outer {
     position: relative;
@@ -429,3 +423,7 @@ iframe[name="google_conversion_frame"] {
         margin-bottom: 0;
     }
 }
+
+.recapitulation-shipping-billing-label {
+    display: none;
+}
diff --git a/00/js/jqueryui/autocomplete.js b/00/js/jqueryui/autocomplete.js
index 8c8ce2b..dceef0f 100644
--- a/00/js/jqueryui/autocomplete.js
+++ b/00/js/jqueryui/autocomplete.js
@@ -17,625 +17,626 @@
 //>>css.theme: ../themes/base/theme.css
 
 ( function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define( [
-			"jquery",
-			"./core",
-			"./widget",
-			"./position",
-			"./menu"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
+    if ( typeof define === "function" && define.amd ) {
+        // AMD. Register as an anonymous module.
+        define( [
+            "jquery",
+            "./core",
+            "./widget",
+            "./position",
+            "./menu"
+        ], factory );
+    } else {
+
+        // Browser globals
+        factory( jQuery );
+    }
 }( function( $ ) {
 
 $.widget( "ui.autocomplete", {
-	version: "@VERSION",
-	defaultElement: "<input>",
-	options: {
-		appendTo: null,
-		autoFocus: false,
-		delay: 300,
-		minLength: 1,
-		position: {
-			my: "left top",
-			at: "left bottom",
-			collision: "none"
-		},
-		source: null,
-
-		// callbacks
-		change: null,
-		close: null,
-		focus: null,
-		open: null,
-		response: null,
-		search: null,
-		select: null
-	},
-
-	requestIndex: 0,
-	pending: 0,
-
-	_create: function() {
-		// Some browsers only repeat keydown events, not keypress events,
-		// so we use the suppressKeyPress flag to determine if we've already
-		// handled the keydown event. #7269
-		// Unfortunately the code for & in keypress is the same as the up arrow,
-		// so we use the suppressKeyPressRepeat flag to avoid handling keypress
-		// events when we know the keydown event was used to modify the
-		// search term. #7799
-		var suppressKeyPress, suppressKeyPressRepeat, suppressInput,
-			nodeName = this.element[ 0 ].nodeName.toLowerCase(),
-			isTextarea = nodeName === "textarea",
-			isInput = nodeName === "input";
-
-		// Textareas are always multi-line
-		// Inputs are always single-line, even if inside a contentEditable element
-		// IE also treats inputs as contentEditable
-		// All other element types are determined by whether or not they're contentEditable
-		this.isMultiLine = isTextarea || !isInput && this.element.prop( "isContentEditable" );
-
-		this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
-		this.isNewMenu = true;
-
-		this._addClass( "ui-autocomplete-input" );
-		this.element.attr( "autocomplete", "off" );
-
-		this._on( this.element, {
-			keydown: function( event ) {
-				if ( this.element.prop( "readOnly" ) ) {
-					suppressKeyPress = true;
-					suppressInput = true;
-					suppressKeyPressRepeat = true;
-					return;
-				}
-
-				suppressKeyPress = false;
-				suppressInput = false;
-				suppressKeyPressRepeat = false;
-				var keyCode = $.ui.keyCode;
-				switch ( event.keyCode ) {
-				case keyCode.PAGE_UP:
-					suppressKeyPress = true;
-					this._move( "previousPage", event );
-					break;
-				case keyCode.PAGE_DOWN:
-					suppressKeyPress = true;
-					this._move( "nextPage", event );
-					break;
-				case keyCode.UP:
-					suppressKeyPress = true;
-					this._keyEvent( "previous", event );
-					break;
-				case keyCode.DOWN:
-					suppressKeyPress = true;
-					this._keyEvent( "next", event );
-					break;
-				case keyCode.ENTER:
-					// when menu is open and has focus
-					if ( this.menu.active ) {
-						// #6055 - Opera still allows the keypress to occur
-						// which causes forms to submit
-						suppressKeyPress = true;
-						event.preventDefault();
-						this.menu.select( event );
-					}
-					break;
-				case keyCode.TAB:
-					if ( this.menu.active ) {
-						this.menu.select( event );
-					}
-					break;
-				case keyCode.ESCAPE:
-					if ( this.menu.element.is( ":visible" ) ) {
-						if ( !this.isMultiLine ) {
-							this._value( this.term );
-						}
-						this.close( event );
-						// Different browsers have different default behavior for escape
-						// Single press can mean undo or clear
-						// Double press in IE means clear the whole form
-						event.preventDefault();
-					}
-					break;
-				default:
-					suppressKeyPressRepeat = true;
-					// search timeout should be triggered before the input value is changed
-					this._searchTimeout( event );
-					break;
-				}
-			},
-			keypress: function( event ) {
-				if ( suppressKeyPress ) {
-					suppressKeyPress = false;
-					if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
-						event.preventDefault();
-					}
-					return;
-				}
-				if ( suppressKeyPressRepeat ) {
-					return;
-				}
-
-				// replicate some key handlers to allow them to repeat in Firefox and Opera
-				var keyCode = $.ui.keyCode;
-				switch ( event.keyCode ) {
-				case keyCode.PAGE_UP:
-					this._move( "previousPage", event );
-					break;
-				case keyCode.PAGE_DOWN:
-					this._move( "nextPage", event );
-					break;
-				case keyCode.UP:
-					this._keyEvent( "previous", event );
-					break;
-				case keyCode.DOWN:
-					this._keyEvent( "next", event );
-					break;
-				}
-			},
-			input: function( event ) {
-				if ( suppressInput ) {
-					suppressInput = false;
-					event.preventDefault();
-					return;
-				}
-				this._searchTimeout( event );
-			},
-			focus: function() {
-				this.selectedItem = null;
-				this.previous = this._value();
-			},
-			blur: function( event ) {
-				if ( this.cancelBlur ) {
-					delete this.cancelBlur;
-					return;
-				}
-
-				clearTimeout( this.searching );
-				this.close( event );
-				this._change( event );
-			}
-		} );
-
-		this._initSource();
-		this.menu = $( "<ul>" )
-			.appendTo( this._appendTo() )
-			.menu( {
-				// disable ARIA support, the live region takes care of that
-				role: null
-			} )
-			.hide()
-			.menu( "instance" );
-
-		this._addClass( this.menu.element, "ui-autocomplete", "ui-front" );
-		this._on( this.menu.element, {
-			mousedown: function( event ) {
-				// prevent moving focus out of the text field
-				event.preventDefault();
-
-				// IE doesn't prevent moving focus even with event.preventDefault()
-				// so we set a flag to know when we should ignore the blur event
-				this.cancelBlur = true;
-				this._delay( function() {
-					delete this.cancelBlur;
-
-					// Support: IE 8 only
-					// Right clicking a menu item or selecting text from the menu items will
-					// result in focus moving out of the input. However, we've already received
-					// and ignored the blur event because of the cancelBlur flag set above. So
-					// we restore focus to ensure that the menu closes properly based on the user's
-					// next actions.
-					if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
-						this.element.trigger( "focus" );
-					}
-				} );
-
-				// clicking on the scrollbar causes focus to shift to the body
-				// but we can't detect a mouseup or a click immediately afterward
-				// so we have to track the next mousedown and close the menu if
-				// the user clicks somewhere outside of the autocomplete
-				var menuElement = this.menu.element[ 0 ];
-				if ( !$( event.target ).closest( ".ui-menu-item" ).length ) {
-					this._delay( function() {
-						var that = this;
-						this.document.one( "mousedown", function( event ) {
-							if ( event.target !== that.element[ 0 ] &&
-									event.target !== menuElement &&
-									!$.contains( menuElement, event.target ) ) {
-								that.close();
-							}
-						} );
-					} );
-				}
-			},
-			menufocus: function( event, ui ) {
-				var label, item;
-				// support: Firefox
-				// Prevent accidental activation of menu items in Firefox (#7024 #9118)
-				if ( this.isNewMenu ) {
-					this.isNewMenu = false;
-					if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) {
-						this.menu.trigger( "blur" );
-
-						this.document.one( "mousemove", function() {
-							$( event.target ).trigger( event.originalEvent );
-						} );
-
-						return;
-					}
-				}
-
-				item = ui.item.data( "ui-autocomplete-item" );
-				if ( false !== this._trigger( "focus", event, { item: item } ) ) {
-					// use value to match what will end up in the input, if it was a key event
-					if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) {
-						this._value( item.value );
-					}
-				}
-
-				// Announce the value in the liveRegion
-				label = ui.item.attr( "aria-label" ) || item.value;
-				if ( label && $.trim( label ).length ) {
-					this.liveRegion.children().hide();
-					$( "<div>" ).text( label ).appendTo( this.liveRegion );
-				}
-			},
-			menuselect: function( event, ui ) {
-				var item = ui.item.data( "ui-autocomplete-item" ),
-					previous = this.previous;
-
-				// only trigger when focus was lost (click on menu)
-				if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
-					this.element.trigger( "focus" );
-					this.previous = previous;
-					// #6109 - IE triggers two focus events and the second
-					// is asynchronous, so we need to reset the previous
-					// term synchronously and asynchronously :-(
-					this._delay( function() {
-						this.previous = previous;
-						this.selectedItem = item;
-					} );
-				}
-
-				if ( false !== this._trigger( "select", event, { item: item } ) ) {
-					this._value( item.value );
-				}
-				// reset the term after the select event
-				// this allows custom select handling to work properly
-				this.term = this._value();
-
-				this.close( event );
-				this.selectedItem = item;
-			}
-		} );
-
-		this.liveRegion = $( "<span>", {
-			role: "status",
-			"aria-live": "assertive",
-			"aria-relevant": "additions"
-		} )
-			.appendTo( this.document[ 0 ].body );
-
-		this._addClass( this.liveRegion, null, "ui-helper-hidden-accessible" );
-
-		// turning off autocomplete prevents the browser from remembering the
-		// value when navigating through history, so we re-enable autocomplete
-		// if the page is unloaded before the widget is destroyed. #7790
-		this._on( this.window, {
-			beforeunload: function() {
-				this.element.removeAttr( "autocomplete" );
-			}
-		} );
-	},
-
-	_destroy: function() {
-		clearTimeout( this.searching );
-		this.element.removeAttr( "autocomplete" );
-		this.menu.element.remove();
-		this.liveRegion.remove();
-	},
-
-	_setOption: function( key, value ) {
-		this._super( key, value );
-		if ( key === "source" ) {
-			this._initSource();
-		}
-		if ( key === "appendTo" ) {
-			this.menu.element.appendTo( this._appendTo() );
-		}
-		if ( key === "disabled" && value && this.xhr ) {
-			this.xhr.abort();
-		}
-	},
-
-	_appendTo: function() {
-		var element = this.options.appendTo;
-
-		if ( element ) {
-			element = element.jquery || element.nodeType ?
-				$( element ) :
-				this.document.find( element ).eq( 0 );
-		}
-
-		if ( !element || !element[ 0 ] ) {
-			element = this.element.closest( ".ui-front, dialog" );
-		}
-
-		if ( !element.length ) {
-			element = this.document[ 0 ].body;
-		}
-
-		return element;
-	},
-
-	_initSource: function() {
-		var array, url,
-			that = this;
-		if ( $.isArray( this.options.source ) ) {
-			array = this.options.source;
-			this.source = function( request, response ) {
-				response( $.ui.autocomplete.filter( array, request.term ) );
-			};
-		} else if ( typeof this.options.source === "string" ) {
-			url = this.options.source;
-			this.source = function( request, response ) {
-				if ( that.xhr ) {
-					that.xhr.abort();
-				}
-				that.xhr = $.ajax( {
-					url: url,
-					data: request,
-					dataType: "json",
-					success: function( data ) {
-						response( data );
-					},
-					error: function() {
-						response( [] );
-					}
-				} );
-			};
-		} else {
-			this.source = this.options.source;
-		}
-	},
-
-	_searchTimeout: function( event ) {
-		clearTimeout( this.searching );
-		this.searching = this._delay( function() {
-
-			// Search if the value has changed, or if the user retypes the same value (see #7434)
-			var equalValues = this.term === this._value(),
-				menuVisible = this.menu.element.is( ":visible" ),
-				modifierKey = event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;
-
-			if ( !equalValues || ( equalValues && !menuVisible && !modifierKey ) ) {
-				this.selectedItem = null;
-				this.search( null, event );
-			}
-		}, this.options.delay );
-	},
-
-	search: function( value, event ) {
-		value = value != null ? value : this._value();
-
-		// always save the actual value, not the one passed as an argument
-		this.term = this._value();
-
-		if ( value.length < this.options.minLength ) {
-			return this.close( event );
-		}
-
-		if ( this._trigger( "search", event ) === false ) {
-			return;
-		}
-
-		return this._search( value );
-	},
-
-	_search: function( value ) {
-		this.pending++;
-		this._addClass( "ui-autocomplete-loading" );
-		this.cancelSearch = false;
-
-		this.source( { term: value }, this._response() );
-	},
-
-	_response: function() {
-		var index = ++this.requestIndex;
-
-		return $.proxy( function( content ) {
-			if ( index === this.requestIndex ) {
-				this.__response( content );
-			}
-
-			this.pending--;
-			if ( !this.pending ) {
-				this._removeClass( "ui-autocomplete-loading" );
-			}
-		}, this );
-	},
-
-	__response: function( content ) {
-		if ( content ) {
-			content = this._normalize( content );
-		}
-		this._trigger( "response", null, { content: content } );
-		if ( !this.options.disabled && content && content.length && !this.cancelSearch ) {
-			this._suggest( content );
-			this._trigger( "open" );
-		} else {
-			// use ._close() instead of .close() so we don't cancel future searches
-			this._close();
-		}
-	},
-
-	close: function( event ) {
-		this.cancelSearch = true;
-		this._close( event );
-	},
-
-	_close: function( event ) {
-		if ( this.menu.element.is( ":visible" ) ) {
-			this.menu.element.hide();
-			this.menu.blur();
-			this.isNewMenu = true;
-			this._trigger( "close", event );
-		}
-	},
-
-	_change: function( event ) {
-		if ( this.previous !== this._value() ) {
-			this._trigger( "change", event, { item: this.selectedItem } );
-		}
-	},
-
-	_normalize: function( items ) {
-		// assume all items have the right format when the first item is complete
-		if ( items.length && items[ 0 ].label && items[ 0 ].value ) {
-			return items;
-		}
-		return $.map( items, function( item ) {
-			if ( typeof item === "string" ) {
-				return {
-					label: item,
-					value: item
-				};
-			}
-			return $.extend( {}, item, {
-				label: item.label || item.value,
-				value: item.value || item.label
-			} );
-		} );
-	},
-
-	_suggest: function( items ) {
-		var ul = this.menu.element.empty();
-		this._renderMenu( ul, items );
-		this.isNewMenu = true;
-		this.menu.refresh();
-
-		// size and position menu
-		ul.show();
-		this._resizeMenu();
-		ul.position( $.extend( {
-			of: this.element
-		}, this.options.position ) );
-
-		if ( this.options.autoFocus ) {
-			this.menu.next();
-		}
-	},
-
-	_resizeMenu: function() {
-		var ul = this.menu.element;
-		ul.outerWidth( Math.max(
-			// Firefox wraps long text (possibly a rounding bug)
-			// so we add 1px to avoid the wrapping (#7513)
-			ul.width( "" ).outerWidth() + 1,
-			this.element.outerWidth()
-		) );
-	},
-
-	_renderMenu: function( ul, items ) {
-		var that = this;
-		$.each( items, function( index, item ) {
-			that._renderItemData( ul, item );
-		} );
-	},
-
-	_renderItemData: function( ul, item ) {
-		return this._renderItem( ul, item ).data( "ui-autocomplete-item", item );
-	},
-
-	_renderItem: function( ul, item ) {
-		return $( "<li>" )
-			.append( $( "<div>" ).text( item.label ) )
-			.appendTo( ul );
-	},
-
-	_move: function( direction, event ) {
-		if ( !this.menu.element.is( ":visible" ) ) {
-			this.search( null, event );
-			return;
-		}
-		if ( this.menu.isFirstItem() && /^previous/.test( direction ) ||
-				this.menu.isLastItem() && /^next/.test( direction ) ) {
-
-			if ( !this.isMultiLine ) {
-				this._value( this.term );
-			}
-
-			this.menu.blur();
-			return;
-		}
-		this.menu[ direction ]( event );
-	},
-
-	widget: function() {
-		return this.menu.element;
-	},
-
-	_value: function() {
-		return this.valueMethod.apply( this.element, arguments );
-	},
-
-	_keyEvent: function( keyEvent, event ) {
-		if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
-			this._move( keyEvent, event );
-
-			// prevents moving cursor to beginning/end of the text field in some browsers
-			event.preventDefault();
-		}
-	}
+    version: "@VERSION",
+    defaultElement: "<input>",
+    options: {
+        appendTo: null,
+        autoFocus: false,
+        delay: 300,
+        minLength: 1,
+        position: {
+            my: "left top",
+            at: "left bottom",
+            collision: "none"
+        },
+        source: null,
+
+        // callbacks
+        change: null,
+        close: null,
+        focus: null,
+        open: null,
+        response: null,
+        search: null,
+        select: null
+    },
+
+    requestIndex: 0,
+    pending: 0,
+
+    _create: function() {
+        // Some browsers only repeat keydown events, not keypress events,
+        // so we use the suppressKeyPress flag to determine if we've already
+        // handled the keydown event. #7269
+        // Unfortunately the code for & in keypress is the same as the up arrow,
+        // so we use the suppressKeyPressRepeat flag to avoid handling keypress
+        // events when we know the keydown event was used to modify the
+        // search term. #7799
+        var suppressKeyPress, suppressKeyPressRepeat, suppressInput,
+            nodeName = this.element[ 0 ].nodeName.toLowerCase(),
+            isTextarea = nodeName === "textarea",
+            isInput = nodeName === "input";
+
+        // Textareas are always multi-line
+        // Inputs are always single-line, even if inside a contentEditable element
+        // IE also treats inputs as contentEditable
+        // All other element types are determined by whether or not they're contentEditable
+        this.isMultiLine = isTextarea || !isInput && this.element.prop( "isContentEditable" );
+
+        this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
+        this.isNewMenu = true;
+
+        this._addClass( "ui-autocomplete-input" );
+        this.element.attr( "autocomplete", "off" );
+
+        this._on( this.element, {
+            keydown: function( event ) {
+                if ( this.element.prop( "readOnly" ) ) {
+                    suppressKeyPress = true;
+                    suppressInput = true;
+                    suppressKeyPressRepeat = true;
+                    return;
+                }
+
+                suppressKeyPress = false;
+                suppressInput = false;
+                suppressKeyPressRepeat = false;
+                var keyCode = $.ui.keyCode;
+                switch ( event.keyCode ) {
+                case keyCode.PAGE_UP:
+                    suppressKeyPress = true;
+                    this._move( "previousPage", event );
+                    break;
+                case keyCode.PAGE_DOWN:
+                    suppressKeyPress = true;
+                    this._move( "nextPage", event );
+                    break;
+                case keyCode.UP:
+                    suppressKeyPress = true;
+                    this._keyEvent( "previous", event );
+                    break;
+                case keyCode.DOWN:
+                    suppressKeyPress = true;
+                    this._keyEvent( "next", event );
+                    break;
+                case keyCode.ENTER:
+                    // when menu is open and has focus
+                    if ( this.menu.active ) {
+                        // #6055 - Opera still allows the keypress to occur
+                        // which causes forms to submit
+                        suppressKeyPress = true;
+                        event.preventDefault();
+                        this.menu.select( event );
+                    }
+                    break;
+                case keyCode.TAB:
+                    if ( this.menu.active ) {
+                        this.menu.select( event );
+                    }
+                    break;
+                case keyCode.ESCAPE:
+                    if ( this.menu.element.is( ":visible" ) ) {
+                        if ( !this.isMultiLine ) {
+                            this._value( this.term );
+                        }
+                        this.close( event );
+                        // Different browsers have different default behavior for escape
+                        // Single press can mean undo or clear
+                        // Double press in IE means clear the whole form
+                        event.preventDefault();
+                    }
+                    break;
+                default:
+                    suppressKeyPressRepeat = true;
+                    // search timeout should be triggered before the input value is changed
+                    this._searchTimeout( event );
+                    break;
+                }
+            },
+            keypress: function( event ) {
+                if ( suppressKeyPress ) {
+                    suppressKeyPress = false;
+                    if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+                        event.preventDefault();
+                    }
+                    return;
+                }
+                if ( suppressKeyPressRepeat ) {
+                    return;
+                }
+
+                // replicate some key handlers to allow them to repeat in Firefox and Opera
+                var keyCode = $.ui.keyCode;
+                switch ( event.keyCode ) {
+                case keyCode.PAGE_UP:
+                    this._move( "previousPage", event );
+                    break;
+                case keyCode.PAGE_DOWN:
+                    this._move( "nextPage", event );
+                    break;
+                case keyCode.UP:
+                    this._keyEvent( "previous", event );
+                    break;
+                case keyCode.DOWN:
+                    this._keyEvent( "next", event );
+                    break;
+                }
+            },
+            input: function( event ) {
+                if ( suppressInput ) {
+                    suppressInput = false;
+                    event.preventDefault();
+                    return;
+                }
+                this._searchTimeout( event );
+            },
+            focus: function() {
+                this.selectedItem = null;
+                this.previous = this._value();
+            },
+            blur: function( event ) {
+                if ( this.cancelBlur ) {
+                    delete this.cancelBlur;
+                    return;
+                }
+
+                clearTimeout( this.searching );
+                this.close( event );
+                this._change( event );
+            }
+        } );
+
+        this._initSource();
+        this.menu = $( "<ul>" )
+            .appendTo( this._appendTo() )
+            .menu( {
+                // disable ARIA support, the live region takes care of that
+                role: null
+            } )
+            .hide()
+            .menu( "instance" );
+
+        this._addClass( this.menu.element, "ui-autocomplete", "ui-front" );
+        this._on( this.menu.element, {
+            mousedown: function( event ) {
+                // prevent moving focus out of the text field
+                event.preventDefault();
+
+                // IE doesn't prevent moving focus even with event.preventDefault()
+                // so we set a flag to know when we should ignore the blur event
+                this.cancelBlur = true;
+                this._delay( function() {
+                    delete this.cancelBlur;
+
+                    // Support: IE 8 only
+                    // Right clicking a menu item or selecting text from the menu items will
+                    // result in focus moving out of the input. However, we've already received
+                    // and ignored the blur event because of the cancelBlur flag set above. So
+                    // we restore focus to ensure that the menu closes properly based on the user's
+                    // next actions.
+                    if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
+                        this.element.trigger( "focus" );
+                    }
+                } );
+
+                // clicking on the scrollbar causes focus to shift to the body
+                // but we can't detect a mouseup or a click immediately afterward
+                // so we have to track the next mousedown and close the menu if
+                // the user clicks somewhere outside of the autocomplete
+                var menuElement = this.menu.element[ 0 ];
+                if ( !$( event.target ).closest( ".ui-menu-item" ).length ) {
+                    this._delay( function() {
+                        var that = this;
+                        this.document.one( "mousedown", function( event ) {
+                            if ( event.target !== that.element[ 0 ] &&
+                                    event.target !== menuElement &&
+                                    !$.contains( menuElement, event.target ) ) {
+                                that.close();
+                            }
+                        } );
+                    } );
+                }
+            },
+            menufocus: function( event, ui ) {
+                var label, item;
+                // support: Firefox
+                // Prevent accidental activation of menu items in Firefox (#7024 #9118)
+                if ( this.isNewMenu ) {
+                    this.isNewMenu = false;
+                    if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) {
+                        if (typeof this.menu.trigger === 'function') {
+                            this.menu.trigger( "blur" );
+                        }
+
+                        this.document.one( "mousemove", function() {
+                            $( event.target ).trigger( event.originalEvent );
+                        } );
+
+                        return;
+                    }
+                }
+
+                item = ui.item.data( "ui-autocomplete-item" );
+                if ( false !== this._trigger( "focus", event, { item: item } ) ) {
+                    // use value to match what will end up in the input, if it was a key event
+                    if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) {
+                        this._value( item.value );
+                    }
+                }
+
+                // Announce the value in the liveRegion
+                label = ui.item.attr( "aria-label" ) || item.value;
+                if ( label && $.trim( label ).length ) {
+                    this.liveRegion.children().hide();
+                    $( "<div>" ).text( label ).appendTo( this.liveRegion );
+                }
+            },
+            menuselect: function( event, ui ) {
+                var item = ui.item.data( "ui-autocomplete-item" ),
+                    previous = this.previous;
+
+                // only trigger when focus was lost (click on menu)
+                if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
+                    this.element.trigger( "focus" );
+                    this.previous = previous;
+                    // #6109 - IE triggers two focus events and the second
+                    // is asynchronous, so we need to reset the previous
+                    // term synchronously and asynchronously :-(
+                    this._delay( function() {
+                        this.previous = previous;
+                        this.selectedItem = item;
+                    } );
+                }
+
+                if ( false !== this._trigger( "select", event, { item: item } ) ) {
+                    this._value( item.value );
+                }
+                // reset the term after the select event
+                // this allows custom select handling to work properly
+                this.term = this._value();
+
+                this.close( event );
+                this.selectedItem = item;
+            }
+        } );
+
+        this.liveRegion = $( "<span>", {
+            role: "status",
+            "aria-live": "assertive",
+            "aria-relevant": "additions"
+        } )
+            .appendTo( this.document[ 0 ].body );
+
+        this._addClass( this.liveRegion, null, "ui-helper-hidden-accessible" );
+
+        // turning off autocomplete prevents the browser from remembering the
+        // value when navigating through history, so we re-enable autocomplete
+        // if the page is unloaded before the widget is destroyed. #7790
+        this._on( this.window, {
+            beforeunload: function() {
+                this.element.removeAttr( "autocomplete" );
+            }
+        } );
+    },
+
+    _destroy: function() {
+        clearTimeout( this.searching );
+        this.element.removeAttr( "autocomplete" );
+        this.menu.element.remove();
+        this.liveRegion.remove();
+    },
+
+    _setOption: function( key, value ) {
+        this._super( key, value );
+        if ( key === "source" ) {
+            this._initSource();
+        }
+        if ( key === "appendTo" ) {
+            this.menu.element.appendTo( this._appendTo() );
+        }
+        if ( key === "disabled" && value && this.xhr ) {
+            this.xhr.abort();
+        }
+    },
+
+    _appendTo: function() {
+        var element = this.options.appendTo;
+
+        if ( element ) {
+            element = element.jquery || element.nodeType ?
+                $( element ) :
+                this.document.find( element ).eq( 0 );
+        }
+
+        if ( !element || !element[ 0 ] ) {
+            element = this.element.closest( ".ui-front, dialog" );
+        }
+
+        if ( !element.length ) {
+            element = this.document[ 0 ].body;
+        }
+
+        return element;
+    },
+
+    _initSource: function() {
+        var array, url,
+            that = this;
+        if ( $.isArray( this.options.source ) ) {
+            array = this.options.source;
+            this.source = function( request, response ) {
+                response( $.ui.autocomplete.filter( array, request.term ) );
+            };
+        } else if ( typeof this.options.source === "string" ) {
+            url = this.options.source;
+            this.source = function( request, response ) {
+                if ( that.xhr ) {
+                    that.xhr.abort();
+                }
+                that.xhr = $.ajax( {
+                    url: url,
+                    data: request,
+                    dataType: "json",
+                    success: function( data ) {
+                        response( data );
+                    },
+                    error: function() {
+                        response( [] );
+                    }
+                } );
+            };
+        } else {
+            this.source = this.options.source;
+        }
+    },
+
+    _searchTimeout: function( event ) {
+        clearTimeout( this.searching );
+        this.searching = this._delay( function() {
+
+            // Search if the value has changed, or if the user retypes the same value (see #7434)
+            var equalValues = this.term === this._value(),
+                menuVisible = this.menu.element.is( ":visible" ),
+                modifierKey = event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;
+
+            if ( !equalValues || ( equalValues && !menuVisible && !modifierKey ) ) {
+                this.selectedItem = null;
+                this.search( null, event );
+            }
+        }, this.options.delay );
+    },
+
+    search: function( value, event ) {
+        value = value != null ? value : this._value();
+
+        // always save the actual value, not the one passed as an argument
+        this.term = this._value();
+
+        if ( value.length < this.options.minLength ) {
+            return this.close( event );
+        }
+
+        if ( this._trigger( "search", event ) === false ) {
+            return;
+        }
+
+        return this._search( value );
+    },
+
+    _search: function( value ) {
+        this.pending++;
+        this._addClass( "ui-autocomplete-loading" );
+        this.cancelSearch = false;
+
+        this.source( { term: value }, this._response() );
+    },
+
+    _response: function() {
+        var index = ++this.requestIndex;
+
+        return $.proxy( function( content ) {
+            if ( index === this.requestIndex ) {
+                this.__response( content );
+            }
+
+            this.pending--;
+            if ( !this.pending ) {
+                this._removeClass( "ui-autocomplete-loading" );
+            }
+        }, this );
+    },
+
+    __response: function( content ) {
+        if ( content ) {
+            content = this._normalize( content );
+        }
+        this._trigger( "response", null, { content: content } );
+        if ( !this.options.disabled && content && content.length && !this.cancelSearch ) {
+            this._suggest( content );
+            this._trigger( "open" );
+        } else {
+            // use ._close() instead of .close() so we don't cancel future searches
+            this._close();
+        }
+    },
+
+    close: function( event ) {
+        this.cancelSearch = true;
+        this._close( event );
+    },
+
+    _close: function( event ) {
+        if ( this.menu.element.is( ":visible" ) ) {
+            this.menu.element.hide();
+            this.menu.blur();
+            this.isNewMenu = true;
+            this._trigger( "close", event );
+        }
+    },
+
+    _change: function( event ) {
+        if ( this.previous !== this._value() ) {
+            this._trigger( "change", event, { item: this.selectedItem } );
+        }
+    },
+
+    _normalize: function( items ) {
+        // assume all items have the right format when the first item is complete
+        if ( items.length && items[ 0 ].label && items[ 0 ].value ) {
+            return items;
+        }
+        return $.map( items, function( item ) {
+            if ( typeof item === "string" ) {
+                return {
+                    label: item,
+                    value: item
+                };
+            }
+            return $.extend( {}, item, {
+                label: item.label || item.value,
+                value: item.value || item.label
+            } );
+        } );
+    },
+
+    _suggest: function( items ) {
+        var ul = this.menu.element.empty();
+        this._renderMenu( ul, items );
+        this.isNewMenu = true;
+        this.menu.refresh();
+
+        // size and position menu
+        ul.show();
+        this._resizeMenu();
+        ul.position( $.extend( {
+            of: this.element
+        }, this.options.position ) );
+
+        if ( this.options.autoFocus ) {
+            this.menu.next();
+        }
+    },
+
+    _resizeMenu: function() {
+        var ul = this.menu.element;
+        ul.outerWidth( Math.max(
+            // Firefox wraps long text (possibly a rounding bug)
+            // so we add 1px to avoid the wrapping (#7513)
+            ul.width( "" ).outerWidth() + 1,
+            this.element.outerWidth()
+        ) );
+    },
+
+    _renderMenu: function( ul, items ) {
+        var that = this;
+        $.each( items, function( index, item ) {
+            that._renderItemData( ul, item );
+        } );
+    },
+
+    _renderItemData: function( ul, item ) {
+        return this._renderItem( ul, item ).data( "ui-autocomplete-item", item );
+    },
+
+    _renderItem: function( ul, item ) {
+        return $( "<li>" )
+            .append( $( "<div>" ).text( item.label ) )
+            .appendTo( ul );
+    },
+
+    _move: function( direction, event ) {
+        if ( !this.menu.element.is( ":visible" ) ) {
+            this.search( null, event );
+            return;
+        }
+        if ( this.menu.isFirstItem() && /^previous/.test( direction ) ||
+                this.menu.isLastItem() && /^next/.test( direction ) ) {
+
+            if ( !this.isMultiLine ) {
+                this._value( this.term );
+            }
+
+            this.menu.blur();
+            return;
+        }
+        this.menu[ direction ]( event );
+    },
+
+    widget: function() {
+        return this.menu.element;
+    },
+
+    _value: function() {
+        return this.valueMethod.apply( this.element, arguments );
+    },
+
+    _keyEvent: function( keyEvent, event ) {
+        if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+            this._move( keyEvent, event );
+
+            // prevents moving cursor to beginning/end of the text field in some browsers
+            event.preventDefault();
+        }
+    }
 } );
 
 $.extend( $.ui.autocomplete, {
-	escapeRegex: function( value ) {
-		return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
-	},
-	filter: function( array, term ) {
-		var matcher = new RegExp( $.ui.autocomplete.escapeRegex( term ), "i" );
-		return $.grep( array, function( value ) {
-			return matcher.test( value.label || value.value || value );
-		} );
-	}
+    escapeRegex: function( value ) {
+        return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
+    },
+    filter: function( array, term ) {
+        var matcher = new RegExp( $.ui.autocomplete.escapeRegex( term ), "i" );
+        return $.grep( array, function( value ) {
+            return matcher.test( value.label || value.value || value );
+        } );
+    }
 } );
 
 // live region extension, adding a `messages` option
 // NOTE: This is an experimental API. We are still investigating
 // a full solution for string manipulation and internationalization.
 $.widget( "ui.autocomplete", $.ui.autocomplete, {
-	options: {
-		messages: {
-			noResults: "No search results.",
-			results: function( amount ) {
-				return amount + ( amount > 1 ? " results are" : " result is" ) +
-					" available, use up and down arrow keys to navigate.";
-			}
-		}
-	},
-
-	__response: function( content ) {
-		var message;
-		this._superApply( arguments );
-		if ( this.options.disabled || this.cancelSearch ) {
-			return;
-		}
-		if ( content && content.length ) {
-			message = this.options.messages.results( content.length );
-		} else {
-			message = this.options.messages.noResults;
-		}
-		this.liveRegion.children().hide();
-		$( "<div>" ).text( message ).appendTo( this.liveRegion );
-	}
+    options: {
+        messages: {
+            noResults: "No search results.",
+            results: function( amount ) {
+                return amount + ( amount > 1 ? " results are" : " result is" ) +
+                    " available, use up and down arrow keys to navigate.";
+            }
+        }
+    },
+
+    __response: function( content ) {
+        var message;
+        this._superApply( arguments );
+        if ( this.options.disabled || this.cancelSearch ) {
+            return;
+        }
+        if ( content && content.length ) {
+            message = this.options.messages.results( content.length );
+        } else {
+            message = this.options.messages.noResults;
+        }
+        this.liveRegion.children().hide();
+        $( "<div>" ).text( message ).appendTo( this.liveRegion );
+    }
 } );
 
 return $.ui.autocomplete;
diff --git a/00/js/libs/cart.js b/00/js/libs/cart.js
index dd7b525..20f3a0e 100644
--- a/00/js/libs/cart.js
+++ b/00/js/libs/cart.js
@@ -116,9 +116,9 @@
             if (content !== false) {
                 shoptet.modal.open({
                     html: shoptet.content.colorboxHeader + content + shoptet.content.colorboxFooter,
-                    width: shoptet.config.colorbox.widthLg,
-                    className: shoptet.config.colorbox.classLg,
-                    onComplete: function () {
+                    width: shoptet.modal.config.widthLg,
+                    className: shoptet.modal.config.classLg,
+                    onComplete: function() {
                         $('.colorbox-html-content img').unveil();
                         $('body').removeClass(shoptet.config.bodyClasses);
                         if ($('.overlay').length > 0) {
@@ -168,10 +168,11 @@
      * This function does not accept any arguments.
      */
     function functionsForStep1() {
-        shoptet.checkout.getStatedValues();
-        shoptet.checkout.setFirstPossibleShippingAndBilling();
-        shoptet.checkout.setActiveShippingAndPayments();
-        shoptet.checkout.payu();
+        shoptet.checkoutShared.getStatedValues();
+        shoptet.checkoutShared.setActiveShippingAndPayments();
+        shoptet.checkoutShared.displayApplePay();
+        shoptet.checkoutShared.setupDeliveryShipping();
+        shoptet.checkoutShared.payu();
     }
 
     /**
@@ -417,9 +418,10 @@
             var content = $('.free-gifts-wrapper').html();
             shoptet.modal.open({
                 html: shoptet.content.colorboxHeader + content + shoptet.content.colorboxFooter,
-                width: shoptet.config.colorbox.widthSm,
-                maxHeight: shoptet.config.colorbox.maxHeight,
-                className: shoptet.config.colorbox.classSm
+                width: shoptet.modal.config.widthSm,
+                maxWidth: shoptet.modal.config.maxWidth,
+                maxHeight: shoptet.modal.config.maxHeight,
+                className: shoptet.modal.config.classSm
             });
             $('#colorbox input').remove();
         });
diff --git a/00/js/libs/checkout.js b/00/js/libs/checkout.js
index a05ad66..4cd3b31 100644
--- a/00/js/libs/checkout.js
+++ b/00/js/libs/checkout.js
@@ -1,270 +1,5 @@
 (function(shoptet) {
 
-    /**
-     * Activate payments related to selected shipping,
-     * deactivate others
-     *
-     * @param {String} billingIds
-     * billingIds = ids of possible payments of selected shipping
-     */
-    function changePaymentRelations(billingIds) {
-        if (billingIds != null) {
-            $('.billing-description, .billing-name').addClass('inactive');
-            var $radios = $('input[name="billingId"], input[name="gopayPayInstrument"]');
-            $radios.attr('disabled', true);
-            $('.table-payu').css('display', 'none');
-
-            $.each(billingIds.split(','), function(i, val) {
-                val = $.trim(val);
-                $('#billingId-' + val).attr('disabled', false);
-                //gopay radio
-                $('.billingId-' + val).attr('disabled', false);
-                $('#descr-billingId-' + val)
-                    .removeClass('inactive')
-                    .addClass('active');
-                $('.name-billingId-' + val)
-                    .removeClass('inactive')
-                    .addClass('active');
-            });
-            if (!$('#payu-template label').hasClass('inactive')) {
-                $('.table-payu').css('display', 'block');
-            }
-        }
-    }
-
-    /**
-     * Call relations between shipping and billing
-     * Used in ordering process, step 2
-     *
-     * This function does not accept any arguments.
-     */
-    function callShippingBillingRelations() {
-        var dataRel = $('#order-shipping-methods .radio-wrapper.active').find('input').attr('data-relations');
-        shoptet.checkout.changePaymentRelations(dataRel);
-    }
-
-    /**
-     * Replacing chosen shipping&billing
-     * Used in ordering process, step 2
-     *
-     * This function does not accept any arguments.
-     */
-    function replacingChosenShippingAndBilling() {
-        var $shippingAndBillingTables = $('.shipping-billing-table');
-        var $shippingAndBillingSummary = $('#shipping-billing-summary');
-        $shippingAndBillingSummary.html('');
-        $shippingAndBillingTables.each(function() {
-            var $activeLine = $(this).find('div.radio-wrapper.active');
-            if (!$activeLine.length) {
-                $activeLine = $(this).find('div.radio-wrapper:first');
-                $activeLine.find('input').prop('checked', true);
-            }
-            var activeLineText = $activeLine.find('label b').clone();
-            activeLineText.find('.question-tooltip').remove();
-            activeLineText = activeLineText.text();
-            var singleLine;
-            if ($activeLine.find('.payment-shipping-price').html() == null) {
-                $activeLine = $('.payu-billing-info');
-                singleLine = '<div class="recapitulation-single"><span>'
-                    + $activeLine.closest('.shipping-billing-table').attr('data-type')
-                    + '</span> <strong><span>' + $activeLine.find('.payment-shipping-price').html()
-                    + '</span> ' + activeLineText + '</strong></div>';
-            } else {
-                singleLine = '<div class="recapitulation-single"><span>'
-                    + $activeLine.closest('.shipping-billing-table').attr('data-type')
-                    + '</span> <strong><span>' + $activeLine.find('.payment-shipping-price').html()
-                    + '</span> ' + activeLineText + '</strong></div>';
-            }
-            $shippingAndBillingSummary.append(singleLine);
-        });
-        $shippingAndBillingSummary.find('.recapitulation-single:last').addClass('last');
-    }
-
-    /**
-     * Reveal matrix price in ordering process
-     *
-     * @param {String} shippingActive
-     * shippingActive = id of selected shipping method
-     * @param {String} billingActive
-     * billingActive = id of selected billing method
-     */
-    function revealMatrixPrice(shippingActive, billingActive) {
-        $('.matrixprice').css('display', 'none');
-        $('.matrixprice#mp-' + shippingActive + '-' + billingActive + ', .matrixprice#wv-' +
-            shippingActive + '-' + billingActive).css('display', 'block');
-    }
-
-    /**
-     * Display price corresponding to selected shipping and billing methods
-     *
-     * This function does not accept any arguments.
-     */
-    function displaySelectedPriceByShippingBillingMethods() {
-        if ($('#order-shipping-methods').length) {
-            var shippingActive = '';
-            var billingActive = '';
-            var $activeShippingDiv = $('#order-shipping-methods div.active');
-            var $activeBillingDiv = $('#order-billing-methods div.active');
-
-            if ($activeShippingDiv.length) {
-                shippingActive = $activeShippingDiv.data('id');
-            }
-
-            if ($activeBillingDiv.length) {
-                billingActive = $activeBillingDiv.data('id');
-            }
-
-            if(shippingActive !== '') {
-                shippingActive = shippingActive.replace('shipping-', '');
-            }
-
-            if(billingActive !== '') {
-                billingActive = billingActive.replace('billing-', '');
-            }
-
-            shoptet.checkout.revealMatrixPrice(shippingActive, billingActive);
-        }
-    }
-
-    /**
-     * Check first possible billing method
-     * Used in ordering process, step 2
-     *
-     * This function does not accept any arguments.
-     */
-    function checkFirstPossibleBillingMethod() {
-        var checkerLocker = 0;
-        var $billingTable = $('#order-billing-methods > div');
-
-        if (!$billingTable.find('input:checked').length) {
-            $billingTable.find('input').each(function() {
-                if (!$(this).closest('label').hasClass('inactive') && checkerLocker === 0) {
-                    $(this).attr('checked', true);
-                    $(this).closest('div').addClass('active');
-                    checkerLocker = 1;
-                }
-            });
-        }
-
-        shoptet.checkout.replacingChosenShippingAndBilling();
-        shoptet.checkout.displaySelectedPriceByShippingBillingMethods();
-    }
-
-    /**
-     * Set first possible combination of shipping and billing
-     * Used in ordering process, step 2
-     *
-     * This function does not accept any arguments.
-     */
-    function setFirstPossibleShippingAndBilling() {
-        var $shippingTable = $('#order-shipping-methods');
-        if (!$shippingTable.find('input:checked').length) {
-            $shippingTable.find('input:first').attr('checked', true);
-            shoptet.checkout.callShippingBillingRelations();
-        }
-        shoptet.checkout.checkFirstPossibleBillingMethod();
-    }
-
-    /**
-     * Set active shipping and payment
-     * Used in ordering process, step 2
-     *
-     * This function does not accept any arguments.
-     */
-    function setActiveShippingAndPayments() {
-        if (shoptet.abilities.elements.recapitulation_in_checkout) {
-            var container = '<div id="shipping-billing-summary" class="order-recapitulation"></div>';
-            $('.order-summary-item.price').before(container);
-        }
-        var $shippingAndBillingTables = $('.shipping-billing-table');
-        $shippingAndBillingTables.each(function() {
-            $(this).find('input[type="radio"]:checked').closest('div').addClass('active');
-        });
-        shoptet.checkout.callShippingBillingRelations();
-        shoptet.checkout.gopaySelectHelper();
-        shoptet.checkout.replacingChosenShippingAndBilling();
-        shoptet.checkout.displaySelectedPriceByShippingBillingMethods();
-    }
-
-    /**
-     * Check if selected billing method is active
-     * Used in ordering process, step 2
-     *
-     * This function does not accept any arguments.
-     */
-    function checkIsSelectedActive() {
-        if ($('#order-billing-methods > div.active label').hasClass('inactive')) {
-            $('#order-billing-methods > div.active input').attr('checked', false);
-            $('#order-billing-methods > div.active').removeClass('active');
-            var checkerLocker = 0;
-            $('#order-billing-methods > div').each(function() {
-                if (!$(this).find('label').hasClass('inactive') && checkerLocker === 0) {
-                    $(this).find('input').click();
-                    $(this).addClass('active');
-                    checkerLocker = 1;
-                }
-            });
-        }
-        shoptet.checkout.replacingChosenShippingAndBilling();
-        shoptet.checkout.displaySelectedPriceByShippingBillingMethods();
-    }
-
-    /**
-     * PayU handling
-     * Used in ordering process, step 1
-     *
-     * This function does not accept any arguments.
-     */
-    function payu() {
-        var $payuTable = $('#payu_');
-        $payuTable.remove();
-        $payuTable.appendTo($('#payu-template'));
-    }
-
-    /**
-     * GoPay handling
-     * sets/unsets name=billingId for hidden input with GoPay selection
-     */
-    function gopaySelectHelper() {
-        if (
-            $('#order-billing-methods .active').find('input[name="gopayPayInstrument"]').attr('checked') === 'checked'
-        ) {
-            $('.gopay-billing').attr('name', 'billingId');
-        } else {
-            $('.gopay-billing').removeAttr('name');
-        }
-    }
-
-    /**
-     * Used in ordering process
-     *
-     * This function does not accept any arguments.
-     */
-    function getStatedValues() {
-        deliveryCountryIdValue = $('#deliveryCountryId').val();
-        regionCountryIdValue = $('#deliveryRegionId').val();
-        currencyCode = $('#payment-currency').val();
-    }
-
-    /**
-     * Fill form values in 2nd step
-     *
-     * @param {Object} $fields
-     * $fields = JSON object with selected delivery address
-     */
-    function setFieldValues($fields) {
-        if (!$fields) {
-            return false;
-        }
-
-        for (key in $fields) {
-            if (document.getElementById(key)) {
-                var field = $('#'+ key);
-                field.val($fields[key]);
-            }
-        }
-    }
-
     /**
      * Toggle another shipping address in 2nd step of order
      *
@@ -318,46 +53,7 @@
         });
     }
 
-    /**
-     * Handler for dynamic resize of modal window
-     *
-     * This function does not accept any arguments.
-     */
-    function modalMagic() {
-        if($('.branch-saved:visible').length) {
-            $('.branch-saved').click(function() {
-                shoptet.modal.close();
-            });
-        }
-        return false;
-    }
 
-    /**
-     * Handler for choosing branches
-     *
-     * @param {String} href
-     * href = href of loaded colorbox
-     * @param {String} branchWrap
-     * branchWrap = parent element of displayed select, which has to be focused
-     * @param {String} branchId
-     * branchId = id of selected branch
-     * @param {String} branchInput
-     * branchInput = selector of input element holding selected branch id
-     */
-    function chooseABranchModal(href, branchWrap, branchId, branchInput) {
-        shoptet.modal.open({
-            maxWidth: shoptet.config.colorbox.maxWidth,
-            width : shoptet.config.colorbox.widthMd,
-            className: shoptet.config.colorbox.classMd,
-            href: href,
-            maxHeight: shoptet.config.colorbox.maxHeight,
-            onComplete: function() {
-                $(branchWrap + ' select:first').focus();
-                $(branchId + ' option[value="' + $(branchInput).val() + '"]').attr('selected', 'selected');
-                $(branchId).trigger('change');
-            }
-        });
-    }
 
     /**
      * Compares height of two elements
@@ -415,374 +111,14 @@
      */
     function handleWithSidebar() {
         if (
-            !shoptet.checkout.compareHeight(shoptet.checkout.$checkoutContent, shoptet.checkout.$checkoutSidebar)
+            !compareHeight(shoptet.checkout.$checkoutContent, shoptet.checkout.$checkoutSidebar)
         ) {
-            shoptet.checkout.fixSidebar();
+            fixSidebar();
         } else {
             shoptet.checkout.$checkoutSidebar.removeAttr('style');
         }
     }
 
-    /**
-     * Attach event listeners and add functionality for elements in checkout
-     *
-     * This function does not accept any arguments.
-     */
-    function setupDeliveryShipping() {
-        var $html = $('html');
-        if (typeof personalCollectionUrl !== 'undefined') {
-            $html.on('click', '.personal-collection-choose-branch a', function(e) {
-                e.preventDefault();
-                var $parentsElement = $(this).closest('div.radio-wrapper');
-                $parentsElement.find('.personal-collection-choose-branch[name="shippingId"]').prop('checked', true);
-                shoptet.checkout.chooseABranchModal(
-                    personalCollectionUrl,
-                    '#personal-collection-wrapper',
-                    '#personalCollectionPointId',
-                    '.personal-collection-point-id'
-                );
-            });
-
-            $html.on('click', '#personal-collection-wrapper a.enabled', function(e) {
-                e.preventDefault();
-                var pointId = $(this).data('point-id');
-                var pointTitle = $(this).data('point-title');
-                var completePointName = shoptet.messages['chosenBranch'] + ': ' + pointTitle + ' ';
-                var changePointLink = $('<a href="#" class="chosen">' + shoptet.messages['change'] + '</a>');
-                $('.personal-collection-choose-branch').html(completePointName).append(changePointLink);
-                $('.personal-collection-point-id').val(pointId);
-                shoptet.modal.close();
-            });
-
-        }
-
-        var postDeliveryPoints = [];
-        if (typeof naPostuUrl !== 'undefined') {
-            postDeliveryPoints.push({
-                prefix: 'na-postu',
-                url: naPostuUrl
-            });
-        }
-        if (typeof doBalikovnyUrl !== 'undefined') {
-            postDeliveryPoints.push({
-                prefix: 'do-balikovny',
-                url: doBalikovnyUrl
-            });
-        }
-        if (typeof hupostPostaPontUrl !== 'undefined') {
-            postDeliveryPoints.push({
-                prefix: 'posta-pont',
-                url: hupostPostaPontUrl
-            });
-        }
-
-        for (var i = 0; i < postDeliveryPoints.length; i++) {
-
-            (function(i) {
-
-                $html.on('click', '.' + postDeliveryPoints[i].prefix + '-choose-post a', function(e) {
-                    e.preventDefault();
-                    $parentsElement = $(this).closest('div.radio-wrapper');
-                    $parentsElement.find('.' + postDeliveryPoints[i].prefix + '-choose-radio[name="shippingId"]:first')
-                        .prop('checked', true);
-                    shoptet.modal.open({
-                        href: postDeliveryPoints[i].url,
-                        width : shoptet.config.colorbox.widthMd,
-                        className: shoptet.config.colorbox.classMd,
-                        onComplete: function() {
-                            shoptet.modal.shoptetResize();
-                        }
-                    });
-                });
-
-                $html.on(
-                    'click',
-                    '#' + postDeliveryPoints[i].prefix + '-result .'
-                    + postDeliveryPoints[i].prefix + '-choose-button',
-                    function() {
-                        var $tr = $(this).closest('tr');
-                        var address = $.trim($tr.find('.' + postDeliveryPoints[i].prefix + '-address').html());
-                        var newString = shoptet.messages['chosenPost'] + ' ' + address + ' ';
-                        var $newLink = $('<a href="#" class="chosen">' + shoptet.messages['change'] + '</a>');
-                        $parentsElement.find('.' + postDeliveryPoints[i].prefix + '-choose-post')
-                            .html(newString).append($newLink).show(0);
-                        if (postDeliveryPoints[i].prefix === 'posta-pont') {
-                            var branchId = $.trim($tr.find('.' + postDeliveryPoints[i].prefix + '-branch-id').html());
-                            $('#' + postDeliveryPoints[i].prefix + '-hidden').val(branchId);
-                        } else {
-                            var zipCode = $.trim($tr.find('.' + postDeliveryPoints[i].prefix + '-zip-code').html());
-                            $('#' + postDeliveryPoints[i].prefix + '-hidden').val(zipCode);
-                        }
-                        shoptet.modal.close();
-                    }
-                );
-            })(i);
-        }
-
-        if (typeof ulozenkaUrl !== 'undefined') {
-
-            $html.on('click', '.ulozenka-choose a', function(e) {
-                e.preventDefault();
-                $parentsElement = $(this).closest('div.radio-wrapper');
-                $parentsElement.find('.ulozenka-choose-branch[name="shippingId"]').prop('checked', true);
-                shoptet.checkout.chooseABranchModal(
-                    ulozenkaUrl + '?id=' + $(this).parents('label').siblings('.ulozenka-choose-branch').attr('value')
-                    + '&deliveryCountryId=' + $('#deliveryCountryId').val(),
-                    '#ulozenka-wrapper',
-                    '#branchId',
-                    '.ulozenka-branch-id'
-                );
-            });
-
-            $html.on('submit', '#ulozenka-form', function(e) {
-                e.preventDefault();
-                var name = $('#ulozenka-wrapper .branch-name').text();
-                var newString = shoptet.messages['chosenBranch'] + ': ' + name + ' ';
-                var $newLink = $('<a href="#" class="chosen">' + shoptet.messages['change'] + '</a>');
-                $parentsElement.find('.ulozenka-choose').html(newString).append($newLink).show(0);
-                $parentsElement.find('.ulozenka-branch-id').val($('#branchId option:selected').val());
-                shoptet.checkout.modalMagic();
-            });
-
-            $html.on('change', '#branchId', function() {
-                var id = $('option:selected', this).val();
-                if ($.trim(id) != '') {
-                    $('#ulozenka-form .loader').removeClass('no-display');
-                    $('#ulozenka-form .branch-saved').removeClass('branch-saved-visible');
-                    $.ajax({
-                        url: '/action/Ulozenka/getBranchInformation/?id=' + id,
-                        type: 'GET',
-                        headers: {'X-Shoptet-XHR': 'Shoptet_Coo7ai'},
-                        success: function(responseData) {
-                            $('#ulozenka-wrapper .detail-information').html(responseData);
-                            $('#ulozenka-form .loader').addClass('no-display');
-                            $('#ulozenka-form .branch-saved').addClass('branch-saved-visible');
-                            $('#ulozenka-form').submit();
-                            shoptet.modal.shoptetResize();
-                        },
-                        error: function() {
-                            showMessage(shoptet.messages['ajaxError'], 'warning', '', false, false);
-                            $('#ulozenka-form .loader').addClass('no-display');
-                        }
-                    });
-                }
-            });
-
-        }
-
-        if (typeof zasilkovnaUrl !== 'undefined') {
-
-            $html.on('click', '.zasilkovna-choose a', function(e) {
-                e.preventDefault();
-                $parentsElement = $(this).closest('div.radio-wrapper');
-                $parentsElement.find('.zasilkovna-choose-branch[name="shippingId"]').prop('checked', true);
-            });
-        }
-
-        if (typeof glsParcelShopUrl !== 'undefined') {
-            var glsParcelShopId = '';
-            var glsParcelShopName = '';
-            var glsModalOpen = false;
-
-            $html.on('click', '.gls-parcel-shop-choose a', function(e) {
-                e.preventDefault();
-                if (glsModalOpen) {
-                    return;
-                }
-                glsModalOpen = true;
-                $parentsElement = $(this).closest('div.radio-wrapper');
-                $parentsElement.find('.gls-parcel-shop-choose-branch[name="shippingId"]').prop('checked', true);
-                shoptet.modal.open({
-                    href: glsParcelShopUrl,
-                    width : shoptet.config.colorbox.widthLg,
-                    className: shoptet.config.colorbox.classLg,
-                    onComplete: function() {
-                        shoptet.modal.shoptetResize();
-                    },
-                    onCleanup: function() {
-                        glsModalOpen = false;
-                        if (glsParcelShopId) {
-                            var completeBranchName = glsParcelShopName + ' ';
-                            var $newLink = $('<a href="#" class="chosen">' + shoptet.messages['change'] + '</a>');
-                            $parentsElement.find('.gls-parcel-shop-choose')
-                                .html(completeBranchName).append($newLink).show(0);
-                            $('input#gls-parcel-shop-hidden').val(glsParcelShopId);
-                        }
-                    }
-                });
-            });
-
-            $html.on('click', '.gls-parcel-shop-confirm', function() {
-                $.colorbox.close();
-            });
-
-            window.glsPSMap_OnSelected_Handler = function(data) {
-                glsParcelShopId = data.pclshopid;
-                glsParcelShopName = data.name;
-                var $confirmWrapper = $('.gls-parcel-shop-confirm-wrapper');
-                if ($confirmWrapper.hasClass('no-display')) {
-                    $('.gls-parcel-shop-confirm-wrapper').removeClass('no-display');
-                    shoptet.modal.shoptetResize();
-                }
-            }
-        }
-
-        if (typeof dpdParcelShopUrl !== 'undefined') {
-
-            $html.on('click', '.dpd-cz-parcel-shop-choose a', function(e) {
-                e.preventDefault();
-                $parentsElement = $(this).closest('div.radio-wrapper');
-                $parentsElement.find('.dpd-cz-parcel-shop-choose-branch[name="shippingId"]').prop('checked', true);
-                shoptet.checkout.chooseABranchModal(
-                    dpdParcelShopUrl,
-                    '#dpd-cz-parcel-shop-wrapper',
-                    '#dpdParcelShopBranchId',
-                    '.dpd-cz-branch-id'
-                );
-            });
-
-            $html.on('submit', '#dpd-cz-parcel-shop-form', function(e) {
-                e.preventDefault();
-                var branchName = $('#dpd-cz-parcel-shop-wrapper .branch-name').text();
-                var branchStreet = $('#dpd-cz-parcel-shop-wrapper .branch-street').text();
-                var branchCity = $('#dpd-cz-parcel-shop-wrapper .branch-city').text();
-                var branchZip = $('#dpd-cz-parcel-shop-wrapper .branch-zip').text();
-                var completeBranchName = shoptet.messages['chosenBranch'] + ': '
-                    + branchCity + ' ' + branchName + ' (' + branchStreet + ', ' + branchZip + ' ' + branchCity + ') ';
-                var $newLink = $('<a href="#" class="chosen">' + shoptet.messages['change'] + '</a>');
-                $parentsElement.find('.dpd-cz-parcel-shop-choose').html(completeBranchName).append($newLink).show(0);
-                $parentsElement.find('.dpd-cz-branch-id').val($('#dpdParcelShopBranchId option:selected').val());
-                shoptet.checkout.modalMagic();
-            });
-
-            $html.on('change', '#dpdParcelShopBranchId', function() {
-                var id = $('option:selected', this).val();
-                if ($.trim(id) !== '') {
-                    $('#dpd-cz-parcel-shop-form .loader').removeClass('no-display');
-                    $('#dpd-cz-parcel-shop-form .branch-saved').removeClass('branch-saved-visible');
-                    $.ajax({
-                        url: '/action/DpdParcelShop/getBranchInformation/?id=' + id,
-                        type: 'GET',
-                        headers: {'X-Shoptet-XHR': 'Shoptet_Coo7ai'},
-                        success: function(responseData) {
-                            $('#dpd-cz-parcel-shop-wrapper .detail-information').html(responseData);
-                            $('#dpd-cz-parcel-shop-form .loader').addClass('no-display');
-                            shoptet.modal.shoptetResize();
-                            $('#dpd-cz-parcel-shop-form .branch-saved').addClass('branch-saved-visible');
-                            $('#dpd-cz-parcel-shop-form').submit();
-                        },
-                        error: function() {
-                            showMessage(shoptet.messages['ajaxError'], 'warning', '', false, false);
-                            $('#dpd-cz-parcel-shop-form .loader').addClass('no-display');
-                        }
-                    });
-                }
-            });
-
-        }
-
-        if (typeof isDpdOnSaturday !== 'undefined') {
-
-            $('.dpd-check-zip a').on('click', function(event) {
-                event.preventDefault();
-                $('#dpd-zip-check-modal .dpd-zip-check-result').hide();
-                $('#dpd-zip-check-text').val("");
-                $('#dpd-zip-check-modal').show();
-                shoptet.modal.open({
-                    maxWidth: shoptet.config.colorbox.maxWidth,
-                    width : shoptet.config.colorbox.widthMd,
-                    className: shoptet.config.colorbox.classMd,
-                    inline: true,
-                    href: '#dpd-zip-check-modal',
-                    onClosed: function() {
-                        $('#dpd-zip-check-modal').hide();
-                    }
-                });
-            });
-
-            $('#dpd-zip-check-modal form').on('submit', function(event) {
-                event.preventDefault();
-                $('#dpd-zip-check-modal .dpd-zip-check-result').hide();
-                var zip = $('#dpd-zip-check-text').val();
-                if (zip !== '') {
-                    $.ajax({
-                        url: '/action/DpdPrivate/checkSaturdayZipCode/?zipCode=' + zip,
-                        headers: {'X-Shoptet-XHR': 'Shoptet_Coo7ai'},
-                        success: function(response) {
-                            if(response == '1') {
-                                $('#dpd-zip-check-valid').show();
-                            } else {
-                                $('#dpd-zip-check-invalid').show();
-                            }
-                            shoptet.modal.shoptetResize();
-                        },
-                        error: function() {
-                        }
-                    });
-                }
-
-            });
-        }
-
-        if (typeof pplPartnerUrl !== 'undefined') {
-
-            $html.on('click', '.ppl-choose a', function(e) {
-                e.preventDefault();
-                $parentsElement = $(this).closest('div.radio-wrapper');
-                $parentsElement.find('.ppl-partner-cz-choose-branch[name="shippingId"]').prop('checked', true);
-                shoptet.checkout.chooseABranchModal(
-                    pplPartnerUrl,
-                    '#ppl-partner-cz-wrapper',
-                    '#pplPartnerBranchId',
-                    '#ppl-partner-cz-branch-id'
-                );
-            });
-
-            $html.on('submit', '#ppl-partner-cz-form', function(e) {
-                e.preventDefault();
-                var name = $('#ppl-partner-cz-wrapper .branch-name').text();
-                var newString = shoptet.messages['chosenBranch'] + ': ' + name + ' ';
-                var $newLink = $('<a href="#" class="chosen">' + shoptet.messages['change'] + '</a>');
-                $parentsElement.find('.ppl-choose').html(newString).append($newLink).show(0);
-                $('#ppl-partner-cz-branch-id').val($('#pplPartnerBranchId option:selected').val());
-                shoptet.checkout.modalMagic();
-            });
-
-            $html.on('change', '#pplPartnerBranchId', function() {
-                var id = $('option:selected', this).val();
-                if ($.trim(id) != '') {
-                    $('#ppl-partner-cz-form .loader').removeClass('no-display');
-                    $('#ppl-partner-cz-form .branch-saved').removeClass('branch-saved-visible');
-                    $.ajax({
-                        url: '/action/PplPartner/getBranchInformation/?id=' + id,
-                        type: 'GET',
-                        headers: {'X-Shoptet-XHR': 'Shoptet_Coo7ai'},
-                        success: function(responseData) {
-                            $('#ppl-partner-cz-wrapper .detail-information').html(responseData);
-                            $('#ppl-partner-cz-form .loader').addClass('no-display');
-                            shoptet.modal.shoptetResize();
-                            $('#ppl-partner-cz-form .branch-saved').addClass('branch-saved-visible');
-                            $('#ppl-partner-cz-form').submit();
-                        },
-                        error: function() {
-                            showMessage(shoptet.messages['ajaxError'], 'warning', '', false, false);
-                            $('#ppl-partner-cz-form .loader').addClass('no-display');
-                        }
-                    });
-                }
-            });
-
-        }
-    }
-
-    function displayApplePay() {
-        try {
-            if (window.ApplePaySession && window.ApplePaySession.canMakePayments()) {
-                $('.apple-pay').show();
-            }
-        } catch (err) {}
-    }
-
     shoptet.checkout = shoptet.checkout || {};
     shoptet.scripts.libs.checkout.forEach(function(fnName) {
         var fn = eval(fnName);
@@ -790,41 +126,29 @@
     });
     shoptet.checkout.$checkoutContent = $('#checkoutContent');
     shoptet.checkout.$checkoutSidebar = $('#checkoutSidebar');
+    shoptet.checkout.handleWithSidebar = handleWithSidebar;
 
-    if (detectResolution(shoptet.config.breakpoints.md) && shoptet.checkout.$checkoutSidebar.length) {
-        if (
-            !shoptet.checkout.compareHeight(shoptet.checkout.$checkoutContent, shoptet.checkout.$checkoutSidebar)
-        ) {
-            shoptet.checkout.fixSidebar();
-        }
-
-        $(window).bind('scroll', function() {
-            shoptet.checkout.handleWithSidebar();
-        });
-
-        $('html').bind('contentResized', function() {
+    document.addEventListener("DOMContentLoaded", function() {
+        if (detectResolution(shoptet.config.breakpoints.md) && shoptet.checkout.$checkoutSidebar.length) {
             if (
-                !shoptet.checkout.compareHeight(shoptet.checkout.$checkoutContent, shoptet.checkout.$checkoutSidebar)
+                !compareHeight(shoptet.checkout.$checkoutContent, shoptet.checkout.$checkoutSidebar)
             ) {
-                shoptet.checkout.fixSidebar();
-            } else {
-                shoptet.checkout.$checkoutSidebar.removeAttr('style');
+                fixSidebar();
             }
-        });
-    }
-
-    document.addEventListener("ajaxDone", function() {
-        shoptet.checkout.setupDeliveryShipping();
-    });
 
-    document.addEventListener("DOMContentLoaded", function() {
+            $(window).bind('scroll', function() {
+                handleWithSidebar();
+            });
 
-        if (shoptet.config.orderingProcess.step === 1) {
-            shoptet.checkout.getStatedValues();
-            shoptet.checkout.setActiveShippingAndPayments();
-            shoptet.checkout.payu();
-            shoptet.checkout.displayApplePay();
-            shoptet.checkout.setupDeliveryShipping();
+            $('html').bind('contentResized', function() {
+                if (
+                    !compareHeight(shoptet.checkout.$checkoutContent, shoptet.checkout.$checkoutSidebar)
+                ) {
+                    fixSidebar();
+                } else {
+                    shoptet.checkout.$checkoutSidebar.removeAttr('style');
+                }
+            });
         }
 
         // remember customer data (via ajax)
@@ -833,27 +157,19 @@
             var lastData = $orderForm.serialize();
             $('#order-form input').blur(function() {
                 var data = $(this).closest('form').serialize();
-                if (data !== lastData) {
-                    shoptet.ajax.makeAjaxRequest(
-                        shoptet.config.customerDataUrl,
-                        shoptet.ajax.requestTypes.post,
-                        data,
-                        {},
-                        {
-                            'X-Shoptet-XHR': 'Shoptet_Coo7ai'
-                        }
-                    );
+                if (data != lastData) {
+                    $.post('/action/OrderingProcess/step2CustomerAjax/', data);
                     lastData = data;
                 }
             });
         }
 
-        var $html = $('html');
-        $html.on('click', '#orderFormButton', function() {
+        var $document = $(document);
+        $document.on('click', '#orderFormButton', function() {
             $('#orderFormSubmit').click();
         });
 
-        $html.on('click', '#orderFormSubmit', function() {
+        $document.on('click', '#orderFormSubmit', function() {
             var $el = $('input[name="shippingId"].choose-branch:checked');
             if ($el.length) {
                 var code = $el.attr('data-code');
@@ -872,12 +188,12 @@
 
         $('#shippingAddressBox').on('change', function() {
             var $fields = $('#shipping-address .form-option-block').find('input');
-            if (this.value == '-1'){
+            if (this.value == '-1') {
                 $fields.each(function() {
                     $(this).val('');
                 });
             } else {
-                shoptet.checkout.setFieldValues($(this).find('option:selected').data('record'));
+                shoptet.checkoutShared.setFieldValues($(this).find('option:selected').data('record'));
             }
             /* Validate */
             $fields.each(function() {
@@ -885,7 +201,7 @@
             });
         }).change();
 
-        $html.on('change', '.ordering-process #deliveryRegionId', function () {
+        $document.on('change', '.ordering-process #deliveryRegionId', function() {
             var $parentForm = $(this).parents('form');
             shoptet.cart.ajaxSubmitForm(
                 $parentForm.attr('action'),
@@ -897,7 +213,7 @@
         });
 
         // Change country in checkout process
-        $html.on('change', '#select-country-payment select', function() {
+        $document.on('change', '#select-country-payment select', function() {
             if ($(this).hasClass('not-ajax')) {
                 return false;
             } else {
@@ -917,63 +233,6 @@
                 }
             }
         });
-
-        // cart step2 - active-inactive shipping and delivery
-        $html.on('click', '.shipping-billing-table div.no-payu', function() {
-            if ($(this).hasClass('active')) {
-                //return false;
-            } else {
-                var $thisLabel = $(this).find('label');
-                if ($thisLabel.hasClass('inactive')) {
-
-                } else {
-                    $(this).closest('.shipping-billing-table').find('div.active').removeClass('active')
-                        .find('input').attr('checked', false);
-                    $(this).addClass('active').find('input').attr('checked', true);
-                    shoptet.checkout.callShippingBillingRelations();
-                    shoptet.checkout.checkIsSelectedActive();
-                    shoptet.checkout.gopaySelectHelper();
-                    if($('a:not(".branch-changed")', this).length) {
-                        $('a', this).trigger('click');
-                    }
-                }
-            }
-        });
-
-        $html.on('click', '#order-billing-methods > div.no-payu', function() {
-            $('.payu-billing input').each(function() {
-                $(this).attr('checked', false);
-            });
-        });
-
-        // PayU
-        $html.on('click', '.table-payu input', function() {
-            $activeLine = $('.payu-billing-info');
-            $('#order-billing-methods > .active > input').attr('checked', false);
-            $('#order-billing-methods div.active').removeClass('active');
-            $activeLine.addClass('active').find('> input').prop('checked', true);
-            singleLine = $activeLine.parents('.shipping-billing-table').attr('data-type')
-                + ': <strong>' + $activeLine.find('b').text() + '<span>'
-                + $activeLine.find('.payment-shipping-price').html() + '</span></strong>';
-            $('#shipping-billing-summary').find('.recapitulation-single.last').html(singleLine);
-
-            shoptet.checkout.displaySelectedPriceByShippingBillingMethods();
-        });
-
-        $payuTable = $('#payu_');
-        if ($payuTable.length && typeof shoptet.config.selectedBillingId !== 'undefined') {
-            $('#payu-template > input[name="billingId"]').siblings('label').on('click', function(e) {
-                e.preventDefault();
-                e.stopPropagation();
-            });
-            if($('#payu-template input[name="billingId"]').is(':checked')) {
-                $('#order-billing-methods .radio-wrapper').removeClass('active');
-                $payuTable.find('input[value="' + shoptet.config.payuPayType + '"]').attr('checked', true);
-                $('#order-billing-methods tr.no-payu').on('click', function() {
-                    $payuTable.find(':checked').attr('checked', false);
-                });
-            }
-        }
     });
 
 })(shoptet);
diff --git a/00/js/libs/checkoutShared.js b/00/js/libs/checkoutShared.js
new file mode 100644
index 0000000..08301c7
--- /dev/null
+++ b/00/js/libs/checkoutShared.js
@@ -0,0 +1,876 @@
+(function(shoptet) {
+
+    /**
+     * Set active shipping and payment
+     * Used in ordering process, step 2
+     *
+     * This function does not accept any arguments.
+     */
+    function setActiveShippingAndPayments() {
+        if (shoptet.abilities.elements.recapitulation_in_checkout) {
+            var container = '<div id="shipping-billing-summary" class="order-recapitulation"></div>';
+            $('.order-summary-item.price').before(container);
+        }
+        var $shippingAndBillingTables = $('.shipping-billing-table');
+        $shippingAndBillingTables.each(function() {
+            if ($(this).find('input[type="radio"]:checked').length) {
+                $(this).find('input[type="radio"]:checked').closest('.radio-wrapper').addClass('active');
+            } else {
+                // For case when selected method was inactivated in the meantime
+                // and there is no checked input
+                $(this).find('input[type="radio"]').first().closest('.radio-wrapper').addClass('active');
+            }
+        });
+        shoptet.checkoutShared.callShippingBillingRelations();
+    }
+
+    /**
+     * Call relations between shipping and billing
+     * Used in ordering process, step 2
+     *
+     * This function does not accept any arguments.
+     */
+    function callShippingBillingRelations() {
+        var billingIds = $('#order-shipping-methods .radio-wrapper.active')
+            .find('input:checked').attr('data-relations');
+        shoptet.checkoutShared.changePaymentRelations(billingIds);
+    }
+
+    /**
+     * Activate payments related to selected shipping,
+     * deactivate others
+     *
+     * @param {String} billingIds
+     * billingIds = ids of possible payments of selected shipping
+     */
+    function changePaymentRelations(billingIds) {
+        if (billingIds) {
+            $('#order-billing-methods .radio-wrapper').addClass('inactive-child');
+            $('.billing-name').addClass('inactive');
+            $('.billing-name').removeClass('active');
+            var $radios = $('input[name="billingId"], input[name="gopayPayInstrument"]');
+            $radios.prop('disabled', true);
+            $('.table-payu').css('display', 'none');
+
+            billingIds = billingIds.split(',');
+            $.each(billingIds, function(i) {
+                var val = $.trim(billingIds[i]);
+                $('#billingId-' + val).prop('disabled', false);
+                //gopay radio
+                $('.billingId-' + val).prop('disabled', false);
+                // Adding class to a label
+                var $activeBilling = $('.name-billingId-' + val);
+                $activeBilling.removeClass('inactive').addClass('active');
+                $activeBilling.parents('.radio-wrapper').removeClass('inactive-child');
+            });
+            // Checked GoPay inputs switches billingId attriute of hidden input
+            if ($('#order-billing-methods .radio-wrapper.active').find('input[name="gopayPayInstrument"]').length) {
+                $('.gopay-billing').attr('name', 'billingId');
+            } else {
+                $('.gopay-billing').removeAttr('name');
+                $('input[name="gopayPayInstrument"]').prop('checked', false);
+            }
+            // Payu table and inputs behavior
+            if (!$('#payu-template label').hasClass('inactive')) {
+                $('.table-payu').css('display', 'block');
+            }
+            if (!$('#payu-template').hasClass('active')) {
+                $('#payu-template input').prop('checked', false);
+            }
+        }
+        shoptet.checkoutShared.checkIsSelectedActive();
+    }
+
+    /**
+     * Replacing chosen shipping&billing
+     * Used in ordering process, step 1
+     *
+     * This function does not accept any arguments.
+     */
+    function replacingChosenShippingAndBilling() {
+        var $shippingAndBillingTables = $('.shipping-billing-table');
+        var $shippingAndBillingSummary = $('#shipping-billing-summary');
+        $shippingAndBillingSummary.html('');
+        $shippingAndBillingTables.each(function() {
+            var $activeLine = $(this).find('.radio-wrapper.active');
+            if (!$activeLine.length) {
+                // TODO: remove this if it doesn't appear in test
+                var err = 'Should not happen. Please let @vracovsky know how you were able to display '
+                + 'this error message. Code: replacingChosenShippingAndBilling';
+                console.error(err);
+                $activeLine = $(this).find('.radio-wrapper:first');
+                $activeLine.find('input').prop('checked', true);
+            }
+            var tableCode = $activeLine.closest('.shipping-billing-table').attr('data-type-code');
+            var ev;
+            if (tableCode === 'shipping') {
+                // Shipping
+                ev = 'ShoptetShippingMethodUpdated';
+                shoptet.checkoutShared.activeShipping = $activeLine[0];
+            } else {
+                // Billing
+                ev = 'ShoptetBillingMethodUpdated';
+                shoptet.checkoutShared.activeBilling = $activeLine[0];
+            }
+            shoptet.scripts.signalCustomEvent(ev);
+            var activeLineText = $activeLine.find('.shipping-billing-name').clone();
+            activeLineText.find('.question-tooltip').remove();
+            activeLineText = activeLineText.text();
+            var singleLine;
+            singleLine = '<div class="recapitulation-single recapitulation-shipping-billing">'
+                + '<span class="recapitulation-shipping-billing-label">'
+                + $activeLine.closest('.shipping-billing-table').attr('data-type')
+                + ':</span> <strong class="recapitulation-shipping-billing-info"><span>'
+                + $activeLine.find('.payment-shipping-price').html()
+                + '</span> ' + activeLineText + '</strong></div>';
+            $shippingAndBillingSummary.append(singleLine);
+        });
+        $shippingAndBillingSummary.find('.recapitulation-single:last').addClass('last');
+        shoptet.checkoutShared.displaySelectedPriceByShippingBillingMethods();
+    }
+
+    /**
+     * Display price corresponding to selected shipping and billing methods
+     *
+     * This function does not accept any arguments.
+     */
+    function displaySelectedPriceByShippingBillingMethods() {
+        if ($('#order-shipping-methods').length) {
+            var shippingActive = '';
+            var billingActive = '';
+            var $activeShippingEl = $('#order-shipping-methods .radio-wrapper.active');
+            var $activeBillingEl = $('#order-billing-methods .radio-wrapper.active');
+
+            if ($activeShippingEl.length) {
+                shippingActive = $activeShippingEl.data('id');
+            }
+
+            if ($activeBillingEl.length) {
+                billingActive = $activeBillingEl.data('id');
+            }
+
+            if (shippingActive !== '') {
+                shippingActive = shippingActive.replace('shipping-', '');
+            }
+
+            if (billingActive !== '') {
+                billingActive = billingActive.replace('billing-', '');
+            }
+
+            shoptet.checkoutShared.updatePriceSummary(shippingActive, billingActive);
+        }
+    }
+
+    /**
+     * Check if selected billing method is active
+     * Used in ordering process, step 2
+     *
+     * This function does not accept any arguments.
+     */
+    function checkIsSelectedActive() {
+        if ($('#order-billing-methods .radio-wrapper.active label').hasClass('inactive')) {
+            $('#order-billing-methods .radio-wrapper.active input').prop('checked', false);
+            $('#order-billing-methods .radio-wrapper.active').removeClass('active');
+            var checkerLocker = 0;
+            $('#order-billing-methods .radio-wrapper').each(function() {
+                if (checkerLocker === 0 && !$(this).find('label').hasClass('inactive')) {
+                    $(this).find('input').prop('checked', true);
+                    $(this).addClass('active');
+                    checkerLocker = 1;
+                }
+            });
+        }
+        shoptet.checkoutShared.replacingChosenShippingAndBilling();
+    }
+
+    /**
+     * PayU handling
+     * Used in ordering process, step 1
+     *
+     * This function does not accept any arguments.
+     */
+    function payu() {
+        var payuTable = document.getElementById('payu_');
+        var payuTemplate = document.getElementById('payu-template');
+        if (payuTable && payuTemplate) {
+            payuTemplate.appendChild(payuTable);
+            if (payuTemplate.querySelector('input[name="billingId"]:checked')) {
+                if (payuTable.querySelector('input[value="' + shoptet.config.payuPayType + '"]')) {
+                    // If the PayU payment method is specified we check it...
+                    payuTable.querySelector('input[value="' + shoptet.config.payuPayType + '"]').checked = true;
+                } else {
+                    // ...otherwise we check the first possible payment method
+                    payuTable.querySelector('input').checked = true;
+                }
+            }
+            payuTable.addEventListener('mousedown', function(e) {
+                e.stopPropagation();
+            });
+            var payuInputs = payuTable.querySelectorAll('.table-payu input');
+            if (payuInputs) {
+                for (var i = 0; i < payuInputs.length; i++) {
+                    payuInputs[i].addEventListener('mousedown', function(e) {
+                        e.stopPropagation();
+                        var activeLine = document.querySelector('.payu-billing-info');
+                        if (!activeLine.classList.contains('active')) {
+                            document.querySelector(
+                                '#order-billing-methods .radio-wrapper.active input'
+                            ).checked = false;
+                            document.querySelector(
+                                '#order-billing-methods .radio-wrapper.active'
+                            ).classList.remove('active');
+                            activeLine.classList.add('active')
+                            activeLine.querySelector('input').checked = true;
+                            shoptet.checkoutShared.replacingChosenShippingAndBilling();
+                        }
+                    });
+                }
+            }
+        }
+    }
+
+    /**
+     * Used in ordering process
+     *
+     * This function does not accept any arguments.
+     */
+    function getStatedValues() {
+        deliveryCountryIdValue = $('#deliveryCountryId').val();
+        regionCountryIdValue = $('#deliveryRegionId').val();
+        currencyCode = $('#payment-currency').val();
+        shoptet.checkoutShared.deliveryCountryId = deliveryCountryIdValue;
+        shoptet.checkoutShared.regionCountryId = regionCountryIdValue;
+        shoptet.checkoutShared.currencyCode = currencyCode;
+        shoptet.scripts.signalCustomEvent('ShoptetBaseShippingInfoObtained');
+    }
+
+    /**
+     * Fill form values in 2nd step
+     *
+     * @param {Object} $fields
+     * $fields = JSON object with selected delivery address
+     */
+    function setFieldValues($fields) {
+        if (!$fields) {
+            return false;
+        }
+        for (key in $fields) {
+            if ($fields.hasOwnProperty(key)) {
+                if (document.getElementById(key)) {
+                    var field = $('#'+key);
+                    field.val($fields[key]);
+                }
+            }
+        }
+    }
+
+    function displayApplePay() {
+        try {
+            if (window.ApplePaySession && window.ApplePaySession.canMakePayments()) {
+                $('.apple-pay').show();
+            }
+        } catch (err) {}
+    }
+
+    function updatePrice(e) {
+        var priceHolder = e.target.querySelector('.payment-shipping-price');
+        priceHolder.innerHTML = e.detail.price.withVat.ShoptetFormatAsCurrency();
+        priceHolder.setAttribute('data-shipping-price', e.detail.price.withVat);
+        priceHolder.setAttribute('data-shipping-price-wv', e.detail.price.withoutVat);
+        var priceNotSpecified = e.target.querySelector('.shipping-price-not-specified');
+        if (priceNotSpecified) {
+            priceNotSpecified.classList.remove('shipping-price-not-specified');
+        }
+        shoptet.checkoutShared.afterPriceChange();
+    }
+
+    /**
+     * Recalculate price summary in ordering process
+     *
+     * @param {String} shippingActive
+     * shippingActive = id of selected shipping method
+     * @param {String} billingActive
+     * billingActive = id of selected billing method
+     */
+    function updatePriceSummary(shippingActive, billingActive) {
+        var shippingPrice = document.querySelector('[data-shipping-price-id="' + shippingActive + '"]');
+        var billingPrice = document.querySelector('[data-billing-price-id="' + billingActive + '"]');
+        var cartPriceWithVat = document.querySelector('[data-price-total]');
+        var cartPriceWithoutVat = document.querySelector('[data-price-total-wv]');
+        // TODO:
+        var shippingPriceNotSpecified = shippingPrice.querySelector('.shipping-price-not-specified');
+        var prices = {
+            shipping: {
+                withVat: Number(shippingPrice.getAttribute('data-shipping-price')),
+                withoutVat: Number(shippingPrice.getAttribute('data-shipping-price-wv'))
+            },
+            billing: {
+                withVat: Number(billingPrice.getAttribute('data-billing-price')),
+                withoutVat: Number(billingPrice.getAttribute('data-billing-price-wv'))
+            },
+            cart: {
+                withVat: Number(cartPriceWithVat.getAttribute('data-price-total')),
+                withoutVat: Number(cartPriceWithoutVat.getAttribute('data-price-total-wv')),
+            }
+        };
+        // TODO: improve not specified behavior
+        var calculatedPriceWithVat = prices.shipping.withVat + prices.billing.withVat + prices.cart.withVat;
+        if (shoptet.config.documentsRounding !== "0") {
+            calculatedPriceWithVat = Math.round(calculatedPriceWithVat);
+        }
+        var calculatedPriceWithoutVat = prices.shipping.withoutVat + prices.billing.withoutVat + prices.cart.withoutVat;
+        cartPriceWithVat.innerHTML = shippingPriceNotSpecified ? shoptet.messages.specifyShippingMethod
+            : calculatedPriceWithVat.ShoptetFormatAsCurrency();
+        cartPriceWithoutVat.innerHTML = shippingPriceNotSpecified ? shoptet.messages.specifyShippingMethod
+            : calculatedPriceWithoutVat.ShoptetFormatAsCurrency();
+    }
+
+    function afterPriceChange() {
+        shoptet.checkoutShared.callShippingBillingRelations();
+    }
+
+    function setupExternalShipping() {
+        var externalShippingWrappers = document.querySelectorAll('[data-external-script="true"]');
+        if (externalShippingWrappers) {
+            for (var i = 0; i < externalShippingWrappers.length; i++) {
+                (function(i) {
+                    externalShippingWrappers[i].addEventListener(
+                        'ShoptetExternalShippingChanged',
+                        function(e) {
+                            var branchInfo = e.target.querySelector('.specify-shipping-method');
+                            branchInfo.classList.add('chosen');
+                            var branchLabel = branchInfo.querySelector('.specified-shipping-method-branch');
+                            var idInput = e.target.querySelector('.external-shipping-method-branch-id');
+                            var labelInput = e.target.querySelector('.external-shipping-method-branch-label');
+                            var priceInputWithVat =
+                                e.target.querySelector('.external-shipping-method-branch-price-with-vat');
+                            var priceInputWithoutVat =
+                                e.target.querySelector('.external-shipping-method-branch-price-without-vat');
+                            var shippingPrice = e.target.querySelector('.payment-shipping-price');
+                            shippingPrice.setAttribute(
+                                'data-shipping-price',
+                                e.detail.price.withVat
+                            );
+                            shippingPrice.setAttribute(
+                                'data-shipping-price-wv',
+                                e.detail.price.withoutVat
+                            );
+                            branchLabel.innerHTML = e.detail.branch.label;
+                            idInput.setAttribute('value', e.detail.branch.id);
+                            labelInput.setAttribute('value', e.detail.branch.label);
+                            priceInputWithVat.setAttribute('value', e.detail.price.withVat);
+                            priceInputWithoutVat.setAttribute('value', e.detail.price.withoutVat);
+                            shoptet.checkoutShared.updatePrice(e);
+                        }
+                    );
+                })(i);
+            }
+        }
+
+        var specifyLinks = document.querySelectorAll('.specify-shipping-method');
+        if (specifyLinks) {
+            for (var i = 0; i < specifyLinks.length; i++) {
+                (function(i) {
+                    var link = specifyLinks[i];
+                    link.addEventListener('click', function(e) {
+                        e.preventDefault();
+                        var $parentsElement = $(this).closest('.radio-wrapper');
+                        $parentsElement[0].dispatchEvent(new CustomEvent('ShoptetShipping_ShippingMethodSelected'));
+                    });
+                })(i);
+            }
+        }
+    }
+
+    /**
+     * Assign functionality to links of external shippings
+     *
+     * @param {Object} wrapper
+     * wrapper = external shipping method (.radio-wrappper)
+     * @param {Object} link
+     * link = link to update selected shipping
+     * @param {Object} e
+     * e = fired event
+     */
+    function handleExternalShippingLinks(wrapper, link, e) {
+        if (!link.classList.contains('chosen') || e.target.closest('a')) {
+            var externalScriptId = wrapper.getAttribute('data-external-script-code');
+            try {
+                var externalScript = shoptet.externalShipping[externalScriptId];
+                shoptet.modal.open({
+                    html: externalScript.modalContent,
+                    width: externalScript.modalWidth || shoptet.modal.config.widthMd,
+                    className: externalScript.modalClass || shoptet.modal.config.classMd,
+                    onComplete: function() {
+                        externalScript.onComplete(wrapper)
+                    },
+                    onClosed: function() {
+                        externalScript.onClosed(wrapper)
+                    }
+                });
+            } catch (ex) {
+                console.error(ex);
+            }
+        } else {
+            shoptet.checkoutShared.afterPriceChange();
+        }
+    }
+
+    /**
+     * Attach event listeners and add functionality for elements in checkout
+     *
+     * This function does not accept any arguments.
+     */
+    function setupDeliveryShipping() {
+        var $document = $(document);
+        if (typeof personalCollectionUrl !== 'undefined') {
+            $document.on('click', '.personal-collection-choose-branch a', function(e) {
+                e.preventDefault();
+                var $parentsElement = $(this).closest('.radio-wrapper');
+                $parentsElement.find('.personal-collection-choose-branch[name="shippingId"]').prop('checked', true);
+                shoptet.checkoutShared.chooseABranchModal(
+                    personalCollectionUrl,
+                    '#personal-collection-wrapper',
+                    '#personalCollectionPointId',
+                    '.personal-collection-point-id'
+                );
+            });
+
+            $document.on('click', '#personal-collection-wrapper a.enabled', function(e) {
+                e.preventDefault();
+                var pointId = $(this).data('point-id');
+                var pointTitle = $(this).data('point-title');
+                var completePointName = shoptet.messages['chosenBranch'] + ': ' + pointTitle + ' ';
+                var changePointLink = $('<a href="#" class="chosen">' + shoptet.messages['change'] + '</a>');
+                $('.personal-collection-choose-branch').html(completePointName).append(changePointLink);
+                $('.personal-collection-point-id').val(pointId);
+                shoptet.modal.close();
+            });
+
+        }
+
+        var postDeliveryPoints = [];
+        if (typeof naPostuUrl !== 'undefined') {
+            postDeliveryPoints.push({
+                prefix: 'na-postu',
+                url: naPostuUrl
+            });
+        }
+        if (typeof doBalikovnyUrl !== 'undefined') {
+            postDeliveryPoints.push({
+                prefix: 'do-balikovny',
+                url: doBalikovnyUrl
+            });
+        }
+        if (typeof hupostPostaPontUrl !== 'undefined') {
+            postDeliveryPoints.push({
+                prefix: 'posta-pont',
+                url: hupostPostaPontUrl
+            });
+        }
+
+        for (var i = 0; i < postDeliveryPoints.length; i++) {
+            (function(i) {
+                $document.on('click', '.' + postDeliveryPoints[i].prefix + '-choose-post a', function(e) {
+                    e.preventDefault();
+                    $parentsElement = $(this).closest('.radio-wrapper');
+                    shoptet.modal.open({
+                        maxWidth: shoptet.modal.config.maxWidth,
+                        href: postDeliveryPoints[i].url,
+                        width: shoptet.modal.config.widthMd,
+                        className: shoptet.modal.config.classMd,
+                        onComplete: function() {
+                            shoptet.modal.resize();
+                        }
+                    });
+                });
+                $document.on(
+                    'click',
+                    '#' + postDeliveryPoints[i].prefix + '-result .'
+                    + postDeliveryPoints[i].prefix + '-choose-button',
+                    function() {
+                        var $tr = $(this).closest('tr');
+                        var address = $.trim($tr.find('.' + postDeliveryPoints[i].prefix + '-address').html());
+                        var newString = shoptet.messages['chosenPost'] + ' ' + address + ' ';
+                        var $newLink = $('<a href="#" class="chosen">' + shoptet.messages['change'] + '</a>');
+                        $parentsElement.find('.' + postDeliveryPoints[i].prefix + '-choose-post')
+                            .html(newString).append($newLink).show(0);
+                        if (postDeliveryPoints[i].prefix === 'posta-pont') {
+                            var branchId = $.trim($tr.find('.' + postDeliveryPoints[i].prefix + '-branch-id').html());
+                            $('#' + postDeliveryPoints[i].prefix + '-hidden').val(branchId);
+                        } else {
+                            var zipCode = $.trim($tr.find('.' + postDeliveryPoints[i].prefix + '-zip-code').html());
+                            $('#' + postDeliveryPoints[i].prefix + '-hidden').val(zipCode);
+                        }
+                        shoptet.modal.close();
+                    }
+                );
+            })(i);
+        }
+
+        if (typeof ulozenkaUrl !== 'undefined') {
+
+            $document.on('click', '.ulozenka-choose a', function(e) {
+                e.preventDefault();
+                $parentsElement = $(this).closest('.radio-wrapper');
+                shoptet.checkoutShared.chooseABranchModal(
+                    ulozenkaUrl + '?id=' + $parentsElement.find('.ulozenka-choose-branch').attr('value')
+                    + '&deliveryCountryId=' + $('#deliveryCountryId').val(),
+                    '#ulozenka-wrapper',
+                    '#branchId',
+                    '.ulozenka-branch-id'
+                );
+            });
+
+            $document.on('submit', '#ulozenka-form', function(e) {
+                e.preventDefault();
+                var name = $('#ulozenka-wrapper .branch-name').text();
+                var newString = shoptet.messages['chosenBranch'] + ': ' + name + ' ';
+                var $newLink = $('<a href="#" class="chosen">' + shoptet.messages['change'] + '</a>');
+                $parentsElement.find('.ulozenka-choose').html(newString).append($newLink).show(0);
+                $parentsElement.find('.ulozenka-branch-id').val($('#branchId option:selected').val());
+                shoptet.checkoutShared.modalMagic();
+            });
+
+            $document.on('change', '#branchId', function() {
+                var id = $('option:selected', this).val();
+                if ($.trim(id) != '') {
+                    $('#ulozenka-form .loader').removeClass('no-display');
+                    $('#ulozenka-form .branch-saved').removeClass('branch-saved-visible').addClass('no-display');
+                    $.ajax({
+                        url: '/action/Ulozenka/getBranchInformation/?id=' + id,
+                        type: 'GET',
+                        success: function(responseData) {
+                            $('#ulozenka-wrapper .detail-information').html(responseData);
+                            $('#ulozenka-form .loader').addClass('no-display');
+                            $('#ulozenka-form .branch-saved').addClass('branch-saved-visible')
+                                .removeClass('no-display');
+                            $('#ulozenka-form').submit();
+                            shoptet.modal.resize();
+                        },
+                        error: function() {
+                            showMessage(shoptet.messages['ajaxError'], 'warning', '', false, false);
+                            $('#ulozenka-form .loader').addClass('no-display');
+                        }
+                    });
+                }
+            });
+
+        }
+
+        if (typeof zasilkovnaUrl !== 'undefined') {
+            $document.on('click', '.zasilkovna-choose a', function(e) {
+                e.preventDefault();
+            });
+        }
+
+        if (typeof glsParcelShopUrl !== 'undefined') {
+            var glsParcelShopId = '';
+            var glsParcelShopName = '';
+            var glsModalOpen = false;
+
+            $document.on('click', '.gls-parcel-shop-choose a', function(e) {
+                e.preventDefault();
+                if (glsModalOpen) {
+                    return;
+                }
+                glsModalOpen = true;
+                $parentsElement = $(this).closest('.radio-wrapper');
+                shoptet.modal.open({
+                    href: glsParcelShopUrl,
+                    width : shoptet.modal.config.widthLg,
+                    className: shoptet.modal.config.classLg,
+                    onComplete: function() {
+                        shoptet.modal.resize();
+                    },
+                    onCleanup: function() {
+                        glsModalOpen = false;
+                        if (glsParcelShopId) {
+                            var completeBranchName = glsParcelShopName + ' ';
+                            var $newLink = $('<a href="#" class="chosen">' + shoptet.messages['change'] + '</a>');
+                            $parentsElement.find('.gls-parcel-shop-choose')
+                                .html(completeBranchName).append($newLink).show(0);
+                            $('input#gls-parcel-shop-hidden').val(glsParcelShopId);
+                        }
+                    }
+                });
+            });
+
+            $document.on('click', '.gls-parcel-shop-confirm', function() {
+                shoptet.modal.close();
+            });
+
+            window.glsPSMap_OnSelected_Handler = function(data) {
+                glsParcelShopId = data.pclshopid;
+                glsParcelShopName = data.name;
+                $('#psitems-canvas > div:not(#' + glsParcelShopId + ')')
+                    .removeClass('psSelected').removeClass('psOver');
+                var $confirmWrapper = $('.gls-parcel-shop-confirm-wrapper');
+                if ($confirmWrapper.hasClass('no-display')) {
+                    $('.gls-parcel-shop-confirm-wrapper').removeClass('no-display');
+                    shoptet.modal.resize();
+                }
+            }
+        }
+
+        if (typeof dpdParcelShopUrl !== 'undefined') {
+
+            $document.on('click', '.dpd-cz-parcel-shop-choose a', function(e) {
+                e.preventDefault();
+                $parentsElement = $(this).closest('.radio-wrapper');
+                shoptet.checkoutShared.chooseABranchModal(
+                    dpdParcelShopUrl,
+                    '#dpd-cz-parcel-shop-wrapper',
+                    '#dpdParcelShopBranchId',
+                    '.dpd-cz-branch-id'
+                );
+            });
+
+            $document.on('submit', '#dpd-cz-parcel-shop-form', function(e) {
+                e.preventDefault();
+                var branchName = $('#dpd-cz-parcel-shop-wrapper .branch-name').text();
+                var branchStreet = $('#dpd-cz-parcel-shop-wrapper .branch-street').text();
+                var branchCity = $('#dpd-cz-parcel-shop-wrapper .branch-city').text();
+                var branchZip = $('#dpd-cz-parcel-shop-wrapper .branch-zip').text();
+                var completeBranchName = shoptet.messages['chosenBranch'] + ': '
+                    + branchCity + ' ' + branchName + ' (' + branchStreet + ', ' + branchZip + ' ' + branchCity + ') ';
+                var $newLink = $('<a href="#" class="chosen">' + shoptet.messages['change'] + '</a>');
+                $parentsElement.find('.dpd-cz-parcel-shop-choose').html(completeBranchName).append($newLink).show(0);
+                $parentsElement.find('.dpd-cz-branch-id').val($('#dpdParcelShopBranchId option:selected').val());
+                shoptet.checkoutShared.modalMagic();
+            });
+
+            $document.on('change', '#dpdParcelShopBranchId', function() {
+                var id = $('option:selected', this).val();
+                if ($.trim(id) !== '') {
+                    $('#dpd-cz-parcel-shop-form .loader').removeClass('no-display');
+                    $('#dpd-cz-parcel-shop-form .branch-saved').removeClass('branch-saved-visible');
+                    $.ajax({
+                        url: '/action/DpdParcelShop/getBranchInformation/?id=' + id,
+                        type: 'GET',
+                        success: function(responseData) {
+                            $('#dpd-cz-parcel-shop-wrapper .detail-information').html(responseData);
+                            $('#dpd-cz-parcel-shop-form .loader').addClass('no-display');
+                            shoptet.modal.resize();
+                            $('#dpd-cz-parcel-shop-form .branch-saved').addClass('branch-saved-visible');
+                            $('#dpd-cz-parcel-shop-form').submit();
+                        },
+                        error: function() {
+                            showMessage(shoptet.messages['ajaxError'], 'warning', '', false, false);
+                            $('#dpd-cz-parcel-shop-form .loader').addClass('no-display');
+                        }
+                    });
+                }
+            });
+
+        }
+
+        if (typeof isDpdOnSaturday !== 'undefined') {
+            // TODO: check this!
+            $document.on('click', '.dpd-check-zip a', function(event) {
+                event.preventDefault();
+                $('#dpd-zip-check-modal .dpd-zip-check-result').hide();
+                $('#dpd-zip-check-text').val('');
+                $('#dpd-zip-check-modal').show();
+                shoptet.modal.open({
+                    maxWidth: shoptet.modal.config.maxWidth,
+                    width: shoptet.modal.config.widthLg,
+                    className: shoptet.modal.config.classLg,
+                    inline: true,
+                    href: '#dpd-zip-check-modal',
+                    onClosed: function() {
+                        $('#dpd-zip-check-modal').hide();
+                    }
+                });
+            });
+
+            $('#dpd-zip-check-modal form').on('submit', function(event) {
+                event.preventDefault();
+                $('#dpd-zip-check-modal .dpd-zip-check-result').hide();
+                var zip = $('#dpd-zip-check-text').val();
+                if (zip !== '') {
+                    $.ajax({
+                        url: '/action/DpdPrivate/checkSaturdayZipCode/?zipCode=' + zip,
+                        success: function(response) {
+                            if (response == '1') {
+                                $('#dpd-zip-check-valid').show();
+                            } else {
+                                $('#dpd-zip-check-invalid').show();
+                            }
+
+                            shoptet.modal.resize();
+                        },
+                        error: function() {
+                        }
+                    });
+                }
+
+            });
+        }
+
+        if (typeof pplPartnerUrl !== 'undefined') {
+            $document.on('click', '.ppl-choose a', function(e) {
+                e.preventDefault();
+                $parentsElement = $(this).closest('.radio-wrapper');
+                shoptet.checkoutShared.chooseABranchModal(
+                    pplPartnerUrl,
+                    '#ppl-partner-cz-wrapper',
+                    '#pplPartnerBranchId',
+                    '#ppl-partner-cz-branch-id'
+                );
+            });
+
+            $document.on('submit', '#ppl-partner-cz-form', function(e) {
+                e.preventDefault();
+                var name = $('#ppl-partner-cz-wrapper .branch-name').text();
+                var newString = shoptet.messages['chosenBranch'] + ': ' + name + ' ';
+                var $newLink = $('<a href="#" class="chosen">' + shoptet.messages['change'] + '</a>');
+                $parentsElement.find('.ppl-choose').html(newString).append($newLink).show(0);
+                $('#ppl-partner-cz-branch-id').val($('#pplPartnerBranchId option:selected').val());
+                shoptet.checkoutShared.modalMagic();
+            });
+
+            $document.on('change', '#pplPartnerBranchId', function() {
+                var id = $('option:selected', this).val();
+                if ($.trim(id) != '') {
+                    $('#ppl-partner-cz-form .loader').removeClass('no-display');
+                    $('#ppl-partner-cz-form .branch-saved').removeClass('branch-saved-visible');
+                    $.ajax({
+                        url: '/action/PplPartner/getBranchInformation/?id=' + id,
+                        type: 'GET',
+                        success: function(responseData) {
+                            $('#ppl-partner-cz-wrapper .detail-information').html(responseData);
+                            $('#ppl-partner-cz-form .loader').addClass('no-display');
+                            shoptet.modal.resize();
+                            $('#ppl-partner-cz-form .branch-saved').addClass('branch-saved-visible');
+                            $('#ppl-partner-cz-form').submit();
+                        },
+                        error: function() {
+                            showMessage(shoptet.messages['ajaxError'], 'warning', '', false, false);
+                            $('#ppl-partner-cz-form .loader').addClass('no-display');
+                        }
+                    });
+                }
+            });
+
+        }
+    }
+
+    /**
+     * Handler for choosing branches
+     *
+     * @param {String} href
+     * href = href of loaded colorbox
+     * @param {String} branchWrap
+     * branchWrap = parent element of displayed select, which has to be focused
+     * @param {String} branchId
+     * branchId = id of selected branch
+     * @param {String} branchInput
+     * branchInput = selector of input element holding selected branch id
+     * branchInput = selector of input element holding selected branch id
+     */
+    function chooseABranchModal(href, branchWrap, branchId, branchInput) {
+        shoptet.modal.open({
+            maxWidth: shoptet.modal.config.maxWidth,
+            maxHeight: shoptet.modal.config.maxHeight,
+            width: shoptet.modal.config.widthMd,
+            className:shoptet.modal.config.ClassMd,
+            href: href,
+            onComplete: function() {
+                $(branchWrap + ' select:first').focus();
+                $(branchId + ' option[value="' + $(branchInput).val() + '"]').attr('selected', 'selected');
+                $(branchId).trigger('change');
+            }
+        });
+    }
+
+    /**
+     * Handler for dynamic resize of modal window
+     *
+     * This function does not accept any arguments.
+     */
+    function modalMagic() {
+        if ($('.branch-saved:visible').length) {
+            $('.branch-saved').click(function() {
+                shoptet.modal.close();
+            });
+        }
+        return false;
+    }
+
+    document.addEventListener('DOMContentLoaded', function() {
+        shoptet.checkoutShared.getStatedValues();
+        shoptet.checkoutShared.setActiveShippingAndPayments();
+        shoptet.checkoutShared.displayApplePay();
+        shoptet.checkoutShared.setupDeliveryShipping();
+        shoptet.checkoutShared.payu();
+        shoptet.checkoutShared.setupExternalShipping();
+        if (typeof changeCountryAndRegions === 'function') {
+            changeCountryAndRegions();
+        }
+        var elements = document.querySelectorAll('.shipping-billing-table .radio-wrapper');
+        for (var i = 0; i < elements.length; i++) {
+            elements[i].addEventListener('mousedown', function(e) {
+                e.stopPropagation();
+                var label = this.querySelector('label');
+                if (label.classList.contains('inactive')) {
+                    return false;
+                }
+                var table = this.closest('.shipping-billing-table');
+                var activeWrappers = table.querySelectorAll('.radio-wrapper.active');
+                if (activeWrappers) {
+                    for (var i = 0; i < activeWrappers.length; i++) {
+                        activeWrappers[i].classList.remove('active');
+                        activeWrappers[i].querySelector('label').classList.remove('active');
+                        var inputs = activeWrappers[i].querySelectorAll('input[name="billingId"]');
+                        for (var i = 0; i < inputs.length; i++) {
+                            inputs[i].checked = false;
+                        }
+                    }
+                }
+                this.classList.add('active');
+                var input = this.querySelector('input[name="billingId"]');
+                if (!input) {
+                    input = this.querySelector('input[name="shippingId"]');
+                }
+                if (input) {
+                    if (!input.checked) {
+                        input.checked = true;
+                    }
+                    if (input.classList.contains('payu')) {
+                        var payuTable = document.querySelector('.table-payu');
+                        if (payuTable && !payuTable.querySelector('input:checked')) {
+                            // Check the first specific PayU billing method
+                            payuTable.querySelector('input[name="pay_type"]').checked = true;
+                        }
+                    }
+                }
+                var link = this.querySelector('a');
+                if (this.getAttribute('data-external-script-code')) {
+                    shoptet.checkoutShared.handleExternalShippingLinks(this, link, e);
+                } else {
+                    shoptet.checkoutShared.callShippingBillingRelations();
+                    if (link) {
+                        if (
+                            link.classList.contains('zasilkovna-name')
+                            && !link.querySelector('.zasilkovna-default')
+                        ) {
+                            return;
+                        }
+                        if (!link.classList.contains('chosen') || e.target instanceof HTMLAnchorElement) {
+                            var ev = new CustomEvent('click', { bubbles: true });
+                            link.dispatchEvent(ev);
+                        }
+                    }
+                }
+            });
+        }
+    });
+
+    shoptet.checkoutShared = shoptet.checkoutShared || {};
+    shoptet.scripts.libs.checkoutShared.forEach(function(fnName) {
+        var fn = eval(fnName);
+        shoptet.scripts.registerFunction(fn, 'checkoutShared');
+    });
+
+})(shoptet);
diff --git a/00/js/libs/config.js b/00/js/libs/config.js
index cfe7f15..56abd37 100644
--- a/00/js/libs/config.js
+++ b/00/js/libs/config.js
@@ -13,22 +13,6 @@
     shoptet.config.breakpoints.lg = 1199;
     shoptet.config.breakpoints.xl = 1439;
 
-    shoptet.config.colorbox = {};
-    shoptet.config.colorbox.opacity = 0.65;
-    shoptet.config.colorbox.maxWidth = '98%';
-    shoptet.config.colorbox.maxHeight = '95%';
-    shoptet.config.colorbox.initialHeight = 480;
-    shoptet.config.colorbox.widthXs = 300;
-    shoptet.config.colorbox.widthSm = 500;
-    shoptet.config.colorbox.widthMd = 700;
-    shoptet.config.colorbox.widthLg = 1152;
-    shoptet.config.colorbox.classXs = 'shoptet-modal-xs';
-    shoptet.config.colorbox.classSm = 'shoptet-modal-sm';
-    shoptet.config.colorbox.classMd = 'shoptet-modal-md';
-    shoptet.config.colorbox.classLg = 'shoptet-modal-lg';
-
     shoptet.config.updateQuantityTimeout = 1000;
 
-    shoptet.config.cartActionUrl = '/action/Cart';
-
 })(shoptet);
diff --git a/00/js/libs/externalShippingOne.js b/00/js/libs/externalShippingOne.js
new file mode 100644
index 0000000..29c1a70
--- /dev/null
+++ b/00/js/libs/externalShippingOne.js
@@ -0,0 +1,92 @@
+(function(shoptet) {
+    var myCustomRuntimeObject = {};
+    myCustomRuntimeObject.updated = false;
+    // create content of modal
+    var modalContent = document.createElement('div');
+    var link = document.createElement('a');
+    link.innerText = 'My custom link text';
+    link.addEventListener('click', function (e) {
+        e.preventDefault();
+        // do all your necessary stuff here
+        myCustomRuntimeObject.branchId = Math.ceil(Math.random(2) * 10);
+        myCustomRuntimeObject.label =
+            'Label of branch' + myCustomRuntimeObject.branchId;
+        myCustomRuntimeObject.price = {
+            withVat: 100,
+            withoutVat: 82.64
+        };
+        // mark change of shipping here
+        myCustomRuntimeObject.updated = true;
+        shoptet.modal.close();
+    });
+    modalContent.appendChild(link);
+
+    // do not ever rewrite shoptet nor shoptet.externalShipping object
+    shoptet.externalShipping = shoptet.externalShipping || {};
+    // `externalShippingOne` - required shipping name in camelCase
+    // must be identical as code of external shipping
+    shoptet.externalShipping.externalShippingOne = {
+        modalContent: modalContent,
+        onComplete: function(el) {
+            // code executed after the modal is fully loaded
+            // you have access to element containing your shipping method details
+            console.log(el);
+            // shoptet.modal.resize() has to be the last called function
+            shoptet.modal.resize();
+        },
+        onClosed: function(el) {
+            if (myCustomRuntimeObject.updated) {
+                // set all necessary details about shipping
+                // and fire event to update prices and labels in checkout
+                var ev = new CustomEvent(
+                    'ShoptetExternalShippingChanged',
+                    {
+                        detail: {
+                            price: myCustomRuntimeObject.price,
+                            branch: {
+                                id: myCustomRuntimeObject.branchId,
+                                label: myCustomRuntimeObject.label
+                            }
+                        }
+                    }
+                );
+                el.dispatchEvent(ev);
+                myCustomRuntimeObject.updated = false;
+            }
+        }
+    };
+    // parameters modalContent, onComplete and onClosed are required
+    // optionally you can use also modalWidth and modalClass parameters
+    // default values are shoptet.modal.config.widthMd and shoptet.modal.config.classMd
+
+    // below are examples of events you should listen to
+    // ShoptetBaseShippingInfoObtained is fired only once after page load
+    // ShoptetShippingMethodUpdated and ShoptetBillingMethodUpdated are fired every time
+    // when the shipping/billing method is changed/confirmed; even if it is caused by your shipping method
+    document.addEventListener('ShoptetBaseShippingInfoObtained', function() {
+        console.log(
+            '%cdeliveryCountryId: ' + shoptet.checkoutShared.deliveryCountryId,
+            'color: violet; font-size: 16px;'
+        );
+        console.log(
+            '%cregionCountryId: ' + shoptet.checkoutShared.regionCountryId,
+            'color: violet; font-size: 16px;'
+        );
+        console.log(
+            '%ccurrencyCode: ' + shoptet.checkoutShared.currencyCode,
+            'color: violet; font-size: 16px;'
+        );
+    });
+    document.addEventListener('ShoptetShippingMethodUpdated', function() {
+        console.log('%cactiveShipping:', 'color: orangered; font-size: 16px;');
+        // currently the shoptet.checkoutShared.activeShipping is HTML div element containing
+        // all information about shipping, you can access necessary information by query selector
+        console.log(shoptet.checkoutShared.activeShipping);
+    });
+    document.addEventListener('ShoptetBillingMethodUpdated', function() {
+        // currently the shoptet.checkoutShared.activeBilling is HTML div element containing
+        // all information about billing, you can access necessary information by query selector
+        console.log('%cactiveBilling:', 'color: orangered; font-size: 16px;');
+        console.log(shoptet.checkoutShared.activeBilling);
+    });
+})(shoptet);
diff --git a/00/js/libs/externalShippingTwo.js b/00/js/libs/externalShippingTwo.js
new file mode 100644
index 0000000..3f9e7cc
--- /dev/null
+++ b/00/js/libs/externalShippingTwo.js
@@ -0,0 +1,92 @@
+(function(shoptet) {
+    var myCustomRuntimeObject = {};
+    myCustomRuntimeObject.updated = false;
+    // create content of modal
+    var modalContent = document.createElement('div');
+    var link = document.createElement('a');
+    link.innerText = 'My custom link text';
+    link.addEventListener('click', function (e) {
+        e.preventDefault();
+        // do all your necessary stuff here
+        myCustomRuntimeObject.branchId = Math.ceil(Math.random(2) * 10);
+        myCustomRuntimeObject.label =
+            'Label of branch' + myCustomRuntimeObject.branchId;
+        myCustomRuntimeObject.price = {
+            withVat: 100,
+            withoutVat: 82.64
+        };
+        // mark change of shipping here
+        myCustomRuntimeObject.updated = true;
+        shoptet.modal.close();
+    });
+    modalContent.appendChild(link);
+
+    // do not ever rewrite shoptet nor shoptet.externalShipping object
+    shoptet.externalShipping = shoptet.externalShipping || {};
+    // `externalShippingTwo` - required shipping name in camelCase
+    // must be identical as code of external shipping
+    shoptet.externalShipping.externalShippingTwo = {
+        modalContent: modalContent,
+        onComplete: function(el) {
+            // code executed after the modal is fully loaded
+            // you have access to element containing your shipping method details
+            console.log(el);
+            // shoptet.modal.resize() has to be the last called function
+            shoptet.modal.resize();
+        },
+        onClosed: function(el) {
+            if (myCustomRuntimeObject.updated) {
+                // set all necessary details about shipping
+                // and fire event to update prices and labels in checkout
+                var ev = new CustomEvent(
+                    'ShoptetExternalShippingChanged',
+                    {
+                        detail: {
+                            price: myCustomRuntimeObject.price,
+                            branch: {
+                                id: myCustomRuntimeObject.branchId,
+                                label: myCustomRuntimeObject.label
+                            }
+                        }
+                    }
+                );
+                el.dispatchEvent(ev);
+                myCustomRuntimeObject.updated = false;
+            }
+        }
+    };
+    // parameters modalContent, onComplete and onClosed are required
+    // optionally you can use also modalWidth and modalClass parameters
+    // default values are shoptet.modal.config.widthMd and shoptet.modal.config.classMd
+
+    // below are examples of events you should listen to
+    // ShoptetBaseShippingInfoObtained is fired only once after page load
+    // ShoptetShippingMethodUpdated and ShoptetBillingMethodUpdated are fired every time
+    // when the shipping/billing method is changed/confirmed; even if it is caused by your shipping method
+    document.addEventListener('ShoptetBaseShippingInfoObtained', function() {
+        console.log(
+            '%cdeliveryCountryId: ' + shoptet.checkoutShared.deliveryCountryId,
+            'color: violet; font-size: 16px;'
+        );
+        console.log(
+            '%cregionCountryId: ' + shoptet.checkoutShared.regionCountryId,
+            'color: violet; font-size: 16px;'
+        );
+        console.log(
+            '%ccurrencyCode: ' + shoptet.checkoutShared.currencyCode,
+            'color: violet; font-size: 16px;'
+        );
+    });
+    document.addEventListener('ShoptetShippingMethodUpdated', function() {
+        console.log('%cactiveShipping:', 'color: orangered; font-size: 16px;');
+        // currently the shoptet.checkoutShared.activeShipping is HTML div element containing
+        // all information about shipping, you can access necessary information by query selector
+        console.log(shoptet.checkoutShared.activeShipping);
+    });
+    document.addEventListener('ShoptetBillingMethodUpdated', function() {
+        // currently the shoptet.checkoutShared.activeBilling is HTML div element containing
+        // all information about billing, you can access necessary information by query selector
+        console.log('%cactiveBilling:', 'color: orangered; font-size: 16px;');
+        console.log(shoptet.checkoutShared.activeBilling);
+    });
+})(shoptet);
diff --git a/00/js/libs/helpers.js b/00/js/libs/helpers.js
index 26f407a..a4f3424 100644
--- a/00/js/libs/helpers.js
+++ b/00/js/libs/helpers.js
@@ -61,13 +61,14 @@
 
     function formatNumber(decimalPlaces, decimalSeparator, thousandSeparator) {
         var number = this;
+        var decSep, decPlaces;
         var thSep = resolveThousandSeparator(thousandSeparator);
         if (!Number.isInteger(number.valueOf())) {
-            var decSep = resolveDecimalSeparator(decimalSeparator);
-            var decPlaces = resolveDecimalPlaces(decimalPlaces);
+            decSep = resolveDecimalSeparator(decimalSeparator);
+            decPlaces = resolveDecimalPlaces(decimalPlaces);
         } else {
-            var decSep = 0;
-            var decPlaces = 0;
+            decSep = 0;
+            decPlaces = 0;
         }
         var s = number < 0 ? '-' : '';
         var i = parseInt(number = Math.abs(+number || 0).toFixed(decPlaces)) + '';
diff --git a/00/js/libs/modal.js b/00/js/libs/modal.js
index af0954b..4093981 100644
--- a/00/js/libs/modal.js
+++ b/00/js/libs/modal.js
@@ -39,15 +39,15 @@
         var width;
         var $colorbox = $('#colorbox');
         // 'colorbox-xs|sm|lg' is fallback for hardcoded classes in partners scripts
-        if ($colorbox.hasClass('colorbox-xs') || $colorbox.hasClass(shoptet.config.colorbox.classXs)) {
-            width = shoptet.config.colorbox.widthXs;
-        } else if ($colorbox.hasClass('colorbox-sm') || $colorbox.hasClass(shoptet.config.colorbox.classSm)) {
-            width = shoptet.config.colorbox.widthSm;
-        } else if ($colorbox.hasClass('colorbox-lg') || $colorbox.hasClass(shoptet.config.colorbox.classLg)) {
-            width = shoptet.config.colorbox.widthLg;
+        if ($colorbox.hasClass('colorbox-xs') || $colorbox.hasClass(shoptet.modal.config.classXs)) {
+            width = shoptet.modal.config.widthXs;
+        } else if ($colorbox.hasClass('colorbox-sm') || $colorbox.hasClass(shoptet.modal.config.classSm)) {
+            width = shoptet.modal.config.widthSm;
+        } else if ($colorbox.hasClass('colorbox-lg') || $colorbox.hasClass(shoptet.modal.config.classLg)) {
+            width = shoptet.modal.config.widthLg;
         } else {
             // colorbox.widthMd is default width of colorbox
-            width = shoptet.config.colorbox.widthMd;
+            width = shoptet.modal.config.widthMd;
         }
         if (!detectResolution(shoptet.config.breakpoints.lg)) {
             var responsiveWidth;
@@ -73,4 +73,18 @@
         shoptet.scripts.registerFunction(fn, 'modal');
     });
 
+    shoptet.modal.config = {};
+    shoptet.modal.config.opacity = 0.65;
+    shoptet.modal.config.maxWidth = '98%';
+    shoptet.modal.config.maxHeight = '95%';
+    shoptet.modal.config.initialHeight = 480;
+    shoptet.modal.config.widthXs = 300;
+    shoptet.modal.config.widthSm = 500;
+    shoptet.modal.config.widthMd = 700;
+    shoptet.modal.config.widthLg = 1152;
+    shoptet.modal.config.classXs = 'shoptet-modal-xs';
+    shoptet.modal.config.classSm = 'shoptet-modal-sm';
+    shoptet.modal.config.classMd = 'shoptet-modal-md';
+    shoptet.modal.config.classLg = 'shoptet-modal-lg';
+
 })(shoptet);
diff --git a/00/js/libs/scripts.js b/00/js/libs/scripts.js
index ddc3789..c7ae32e 100644
--- a/00/js/libs/scripts.js
+++ b/00/js/libs/scripts.js
@@ -212,7 +212,10 @@
         'ShoptetDataLayerUpdated',
         'ShoptetValidationTransform',
         'ShoptetValidationWarning',
-        'ShoptetValidationError'
+        'ShoptetValidationError',
+        'ShoptetBaseShippingInfoObtained',
+        'ShoptetShippingMethodUpdated',
+        'ShoptetBillingMethodUpdated'
     ];
     // TODO: updateCartButton - on cart page unnecessary
     shoptet.scripts.libs = {
@@ -236,27 +239,27 @@
             'create'
         ],
         checkout: [
-            'changePaymentRelations',
+            'toggleAnotherShipping'
+        ],
+        checkoutShared: [
+            'displaySelectedPriceByShippingBillingMethods',
             'callShippingBillingRelations',
+            'changePaymentRelations',
             'replacingChosenShippingAndBilling',
-            'revealMatrixPrice',
-            'displaySelectedPriceByShippingBillingMethods',
-            'checkFirstPossibleBillingMethod',
-            'setFirstPossibleShippingAndBilling',
             'setActiveShippingAndPayments',
             'checkIsSelectedActive',
             'payu',
-            'gopaySelectHelper',
             'getStatedValues',
             'setFieldValues',
-            'toggleAnotherShipping',
-            'modalMagic',
-            'chooseABranchModal',
-            'compareHeight',
-            'fixSidebar',
-            'handleWithSidebar',
+            'displayApplePay',
+            'updatePrice',
+            'updatePriceSummary',
+            'afterPriceChange',
+            'setupExternalShipping',
+            'handleExternalShippingLinks',
             'setupDeliveryShipping',
-            'displayApplePay'
+            'chooseABranchModal',
+            'modalMagic'
         ],
         validator: [
             'initNewValidator',
diff --git a/00/js/modules/globalFunctions.js b/00/js/modules/globalFunctions.js
index 23731c6..219d981 100644
--- a/00/js/modules/globalFunctions.js
+++ b/00/js/modules/globalFunctions.js
@@ -5,10 +5,10 @@ var currencyExchangeRate = shoptet.helpers.toFloat($('#currencyExchangeRate').te
 
 // Colorbox defaults
 // $.colorbox.settings.opacity must be identical as alpha channel of @overlay-bg in theme-variables.less
-$.colorbox.settings.opacity = shoptet.config.colorbox.opacity;
-$.colorbox.settings.maxWidth = shoptet.config.colorbox.maxWidth;
-$.colorbox.settings.initialWidth = shoptet.config.colorbox.widthMd;
-$.colorbox.settings.initialHeight = shoptet.config.colorbox.initialHeight;
+$.colorbox.settings.opacity = shoptet.modal.config.opacity;
+$.colorbox.settings.maxWidth = shoptet.modal.config.maxWidth;
+$.colorbox.settings.initialWidth = shoptet.modal.config.widthMd;
+$.colorbox.settings.initialHeight = shoptet.modal.config.initialHeight;
 shoptet.config.bodyClasses = 'user-action-visible' +
     ' navigation-window-visible' +
     ' cart-window-visible' +
@@ -366,9 +366,9 @@ function initColorbox() {
         for(var key in $lightboxes) {
             $('*[data-gallery="' + key + '"]').colorbox({
                 rel: key,
-                maxWidth: shoptet.config.colorbox.maxWidth,
-                width: shoptet.config.colorbox.widthLg,
-                className: shoptet.config.colorbox.classLg
+                maxWidth: shoptet.modal.config.maxWidth,
+                width: shoptet.modal.config.widthLg,
+                className: shoptet.modal.config.classLg
             });
         }
     }
@@ -712,8 +712,8 @@ document.addEventListener('DOMContentLoaded', function() {
             closeButton: showOnly,
             overlayClose: showOnly,
             html: shoptet.content.colorboxHeader + content + shoptet.content.colorboxFooter,
-            className: shoptet.config.colorbox.classMd,
-            width: shoptet.config.colorbox.widthMd,
+            className: shoptet.modal.config.classMd,
+            width: shoptet.modal.config.widthMd,
             onClosed: function() {
                 $('.site-agreement').remove();
             }
@@ -937,8 +937,8 @@ document.addEventListener('DOMContentLoaded', function() {
         e.preventDefault();
         shoptet.modal.open({
             href: $(this).attr('href'),
-            width : shoptet.config.colorbox.widthSm,
-            className: shoptet.config.colorbox.classSm,
+            width : shoptet.modal.config.widthSm,
+            className: shoptet.modal.config.classSm,
             onComplete: function() {
                 shoptet.validator.initValidator($('form'));
             }
@@ -949,9 +949,9 @@ document.addEventListener('DOMContentLoaded', function() {
         e.preventDefault();
         shoptet.modal.open({
             href: $(this).attr('href'),
-            maxWidth: shoptet.config.colorbox.maxWidth,
-            width : shoptet.config.colorbox.widthLg,
-            className: shoptet.config.colorbox.classLg
+            maxWidth: shoptet.modal.config.maxWidth,
+            width : shoptet.modal.config.widthLg,
+            className: shoptet.modal.config.classLg
         });
     });
 
diff --git a/09/css/modules/cart.less b/09/css/modules/cart.less
index 2f00310..28f9a21 100644
--- a/09/css/modules/cart.less
+++ b/09/css/modules/cart.less
@@ -390,10 +390,6 @@
     }
 }
 
-.matrixprice {
-    display: none;
-}
-
 .site-msg-custom.step-1 {
     margin-bottom: round(@line-height-computed * 2);
 }