Merge remote-tracking branch 'origin/develop' into develop

master
dalong306 4 years ago
commit b18bd89eaf

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>2.3.80</version> <version>2.3.82</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.4.0</jib-maven-plugin.version> <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

Binary file not shown.

After

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 KiB

@ -714,6 +714,7 @@
<option value="v4">v4</option> <option value="v4">v4</option>
<option value="v5">v5</option> <option value="v5">v5</option>
<option value="v6">v6</option> <option value="v6">v6</option>
<!-- <option value="v2101">multiple payment methods</option>-->
</select> </select>
</div> </div>
<div class="col-sm-12"> <div class="col-sm-12">
@ -731,6 +732,10 @@
src="/static/images/payment_page_v5.jpg"> src="/static/images/payment_page_v5.jpg">
<img style="width: 200px" ng-if="paymentInfo.paypad_version=='v6'" <img style="width: 200px" ng-if="paymentInfo.paypad_version=='v6'"
src="/static/images/payment_page_v6.jpg"> src="/static/images/payment_page_v6.jpg">
<img style="width: 200px" ng-if="paymentInfo.paypad_version=='v2101'"
src="/static/images/payment_page_v2101_step1.png">
<img style="width: 200px" ng-if="paymentInfo.paypad_version=='v2101'"
src="/static/images/payment_page_v2101_step2.png">
</div> </div>
</div> </div>
</div> </div>

Loading…
Cancel
Save