Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OSEL: Misplaced "OR" Text Under Payment Methods #72

Closed
influxweb opened this issue Oct 4, 2019 · 0 comments · Fixed by #79
Closed

OSEL: Misplaced "OR" Text Under Payment Methods #72

influxweb opened this issue Oct 4, 2019 · 0 comments · Fixed by #79
Assignees
@influxweb
Labels
bug verified
Milestone
v1.0.6

Comments

@influxweb
Copy link
Contributor

If a customer is logged in and checking out there is an Or with no options after it displayed above the Continue Payment button. This is due to either the the Customer Credit module not being used or the customer not having any credit.

Correcting the Issue

Removing the MVT:IF statement containing the errant text and placing it, instead, within the following check for customer credit solves the issue. I have added this update and it will be included in the next maintenance release.

To make the update prior to the next release, you will need to update the code in User Interface -> Pages -> OSEL -> Template:

<mvt:item name="html_profile" />
<head>
	<meta charset="utf-8">
	<meta http-equiv="X-UA-Compatible" content="IE=edge">
	<meta name="viewport" content="width=device-width, initial-scale=1">
	<base href="&mvt:global:basehref;">
	<mvt:if expr="NOT ISNULL l.settings:page:title">
		<title>&mvt:page:title;</title>
	<mvt:else>
		<title>&mvt:store:name;: &mvt:page:name;</title>
	</mvt:if>
	<mvt:item name="head" param="css_list" />
	<mvt:item name="head" param="head_tag" />
</head>
<body id="js-&mvte:page:code;" class="o-site-wrapper t-page-&mvt:global:pageClass;">
	<mvt:item name="hdft" param="global_header" />

	<section class="o-layout">
		<div class="o-layout__item">
			<mvt:item name="hdft" param="header" />
			<mvt:item name="customfields" param="Write_Basket('basket', g.basket)" />
		</div>
	</section>

	<section class="o-layout o-layout--wide">
		<div class="o-layout__item u-width-12 u-width-8--l u-width-5--w u-offset-2--w">
			<mvt:item name="readytheme" param="contentsection( 'checkout_steps' )" />
			<mvt:item name="readytheme" param="contentsection( 'messages' )" />

			<form method="post" action="&mvte:urls:OPAY:secure;">
				<fieldset>
					<legend>&mvt:page:name;</legend>
					<mvt:item name="tax" />
					<input type="hidden" name="Action" value="SHIP,PSHP,CTAX" />
					<p class="c-heading-echo u-text-bold u-text-uppercase">Choose A Shipping Method</p>
					<ul class="c-form-list u-text-constrain">
						<mvt:if expr="ISNULL l.settings:shippingmethods">
							<li class="c-form-list__item c-form-list__item--full">
								<p class="x-messages x-messages--info">No valid shipping methods are available for your order. You will be contacted regarding shipping when your order is processed.</p>
							</li>
						</mvt:if>
						<mvt:if expr="ISNULL l.settings:shippingmethods">
							<li class="c-form-list__item c-form-list__item--full u-font-small">
								<mvt:if expr="ISNULL l.settings:fallbackshippingmethod">
									<label class="c-form-checkbox c-form-checkbox--radio">
										<input class="c-form-checkbox__input" type="radio" name="ShippingMethod" value="" checked>
										<span class="c-form-checkbox__caption">Unable to Calculate Shipping Costs</span>
									</label>
								<mvt:else>
									<label class="c-form-checkbox c-form-checkbox--radio">
										<input class="c-form-checkbox__input" type="radio" name="ShippingMethod" value="" checked>
										<span class="c-form-checkbox__caption o-layout o-list-inline o-layout--align-baseline u-flex">
											<span class="o-list-inline__item">&mvt:fallbackshippingmethod:name;</span>
											<span class="o-list-inline__item o-layout--grow">
												<span class="c-keyline c-keyline--small u-block"></span>
											</span>
											<span class="o-list-inline__item">&mvt:fallbackshippingmethod:formatted_price;</span>
										</span>
									</label>
								</mvt:if>
							</li>
						<mvt:else>
							<mvt:foreach array="shippingmethods" iterator="method">
								<li class="c-form-list__item c-form-list__item--full u-font-small">
									<mvt:if expr="pos1 EQ 1">
										<label class="c-form-checkbox c-form-checkbox--radio">
											<input class="c-form-checkbox__input" type="radio" name="ShippingMethod" value="&mvte:method:module;:&mvte:method:code" checked>
											<span class="c-form-checkbox__caption o-layout o-list-inline o-layout--align-baseline u-flex">
												<span class="o-list-inline__item">&mvt:method:name;</span>
												<mvt:if expr="NOT ISNULL l.settings:method:price">
													<span class="o-list-inline__item o-layout--grow">
														<span class="c-keyline c-keyline--small u-block"></span>
													</span>
													<span class="o-list-inline__item">&mvt:method:formatted_price;</span>
												</mvt:if>
											</span>
										</label>
									<mvt:else>
										<label class="c-form-checkbox c-form-checkbox--radio">
											<input class="c-form-checkbox__input" type="radio" name="ShippingMethod" value="&mvte:method:module;:&mvte:method:code">
											<span class="c-form-checkbox__caption o-layout o-list-inline o-layout--align-baseline u-flex">
												<span class="o-list-inline__item">&mvt:method:name;</span>
												<mvt:if expr="NOT ISNULL l.settings:method:price">
													<span class="o-list-inline__item o-layout--grow">
														<span class="c-keyline c-keyline--small u-block"></span>
													</span>
													<span class="o-list-inline__item">&mvt:method:formatted_price;</span>
												</mvt:if>
											</span>
										</label>
									</mvt:if>
								</li>
							</mvt:foreach>
						</mvt:if>
					</ul>
					<br>
					<ul class="c-form-list">
						<li class="c-form-list__item c-form-list__item--full">
							<mvt:item name="customfields" param="Read_Basket('order_instructions', g.order_instructions)" />
							<label class="c-form-label c-heading-echo u-text-bold u-text-uppercase" for="order_instructions" title="Delivery Notes">Delivery Notes <span class="c-heading--subheading">(Optional)</span></label>
							<textarea id="order_instructions" class="c-form-input c-form-input--long" name="order_instructions">&mvte:global:order_instructions;</textarea>
						</li>
					</ul>
					<hr class="c-keyline">
					<p class="c-heading-echo u-text-bold u-text-uppercase">Select Your Payment Method</p>
					<ul class="c-form-list">
						<mvt:foreach array="paymentmethods" iterator="method">
							<mvt:if expr="l.settings:method:module NE 'customercredit'">
								<li class="c-form-list__item c-form-list__item--full u-font-small">
									<mvt:if expr="pos1 EQ 1">
										<label class="c-form-checkbox c-form-checkbox--radio">
											<mvt:if expr="l.settings:method:paymentcard:id">
												<input class="c-form-checkbox__input" type="radio" name="PaymentMethod" value="paymentcard:&mvte:method:paymentcard:id;" checked>
											<mvt:elseif expr="l.settings:method:paymentcardtype:id">
												<input class="c-form-checkbox__input" type="radio" name="PaymentMethod" value="paymentcardtype:&mvte:method:paymentcardtype:id;" checked>
											<mvt:else>
												<input class="c-form-checkbox__input" type="radio" name="PaymentMethod" value="&mvte:method:module;:&mvte:method:code;" checked>
											</mvt:if>
											<span class="c-form-checkbox__caption">&mvt:method:name;</span>
										</label>
									<mvt:else>
										<label class="c-form-checkbox c-form-checkbox--radio">
											<mvt:if expr="l.settings:method:paymentcard:id">
												<input class="c-form-checkbox__input" type="radio" name="PaymentMethod" value="paymentcard:&mvte:method:paymentcard:id;">
											<mvt:elseif expr="l.settings:method:paymentcardtype:id">
												<input class="c-form-checkbox__input" type="radio" name="PaymentMethod" value="paymentcardtype:&mvte:method:paymentcardtype:id;">
											<mvt:else>
												<input class="c-form-checkbox__input" type="radio" name="PaymentMethod" value="&mvte:method:module;:&mvte:method:code;">
											</mvt:if>
											<span class="c-form-checkbox__caption">&mvt:method:name;</span>
										</label>
									</mvt:if>
								</li>
							</mvt:if>
						</mvt:foreach>
						<mvt:foreach array="paymentmethods" iterator="method">
							<mvt:if expr="l.settings:method:module EQ 'customercredit'">
								<li class="c-form-list__item c-form-list__item--full u-font-small">
									<span class="o-layout o-layout--align-baseline">
										<strong class="o-layout__item o-layout--no-grow">Or</strong>
										<span class="o-layout__item">
											<span class="c-keyline c-keyline--small u-block"></span>
										</span>
									</span>
								</li>
								<li class="c-form-list__item c-form-list__item--full u-font-small">
									<label class="c-form-checkbox c-form-checkbox--radio">
										<mvt:if expr="l.settings:method:paymentcard:id">
											<input class="c-form-checkbox__input" type="radio" name="PaymentMethod" value="paymentcard:&mvte:method:paymentcard:id;">
										<mvt:elseif expr="l.settings:method:paymentcardtype:id">
											<input class="c-form-checkbox__input" type="radio" name="PaymentMethod" value="paymentcardtype:&mvte:method:paymentcardtype:id;">
										<mvt:else>
											<input class="c-form-checkbox__input" type="radio" name="PaymentMethod" value="&mvte:method:module;:&mvte:method:code;">
										</mvt:if>
										<span class="c-form-checkbox__caption">&mvt:method:name;</span>
									</label>
								</li>
								<mvt:foreachstop />
							</mvt:if>
						</mvt:foreach>
					</ul>
					<ul class="c-form-list">
						<li class="c-form-list__item c-form-list__item--full u-text-right">
							<input class="c-button c-button--huge u-bg-gray-50 u-font-small u-text-medium u-text-uppercase" type="submit" value="Continue to Payment">
						</li>
					</ul>
				</fieldset>
			</form>
		</div>
		<aside class="o-layout__item u-width-12 u-width-4--l u-width-5--w">
			<mvt:item name="basket" />
		</aside>
	</section>
	
	<section class="o-layout">
		<div class="o-layout__item">
			<mvt:item name="hdft" param="footer" />
		</div>
	</section>

	<mvt:item name="hdft" param="global_footer" />
</body>
</html>
@influxweb influxweb added this to the v1.0.6 milestone Oct 4, 2019
@influxweb influxweb self-assigned this Oct 4, 2019
influxweb added a commit that referenced this issue Oct 18, 2019
@influxweb
v1.0.6
ac7b051 
This maintenance release addresses all issues contained in the v1.0.6 milestone.
https://github.com/mivaecommerce/readytheme-shadows/milestone/7?closed=1

This closes #68, closes #69, closes #70, closes #71, closes #72, closes #73, closes #74, closes #75, closes #76, closes #77, and closes #78
@influxweb influxweb mentioned this issue Oct 18, 2019
Merged
influxweb added a commit that referenced this issue Oct 18, 2019
@influxweb
v1.0.6 (#79)
532429a 
This maintenance release addresses all issues contained in the v1.0.6 milestone.
https://github.com/mivaecommerce/readytheme-shadows/milestone/7?closed=1

This closes #68, closes #69, closes #70, closes #71, closes #72, closes #73, closes #74, closes #75, closes #76, closes #77, and closes #78
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@influxweb influxweb

Labels
bug verified
Projects
None yet
Milestone
v1.0.6
Development

Successfully merging a pull request may close this issue.

v1.0.6 mivaecommerce/readytheme-shadows
1 participant
@influxweb