Skip to content

Commit

Permalink
VCST-236: Blade freeze when user try to edit subscription (#89)
Browse files Browse the repository at this point in the history
fix: Blade freeze when user try to edit subscription
fix: Improve UX
  • Loading branch information
OlegoO committed May 29, 2024
1 parent 158b6cb commit 85b4736
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="blade-static __bottom" ng-include="'$(Platform)/Scripts/common/templates/create.tpl.html'" ng-if="blade.isNew"></div>
<div class="blade-static __bottom" ng-include="'$(Platform)/Scripts/common/templates/create.tpl.html'" ng-if="blade.isNew"></div>
<div class="blade-static __bottom" ng-include="'$(Platform)/Scripts/common/templates/ok-cancel2.tpl.html'" ng-if="!blade.isApiSave"></div>
<div class="blade-content __tree">
<div class="blade-inner">
<div class="inner-block">
<form name="formScope">
<form name="formScope" class="form">
<fieldset ng-disabled="blade.isLocked">
<div class="clearfix" ng-init="setForm(formScope)">
<div class="column">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="blade-content __medium-wide">
<div class="blade-content __medium-wide">
<div class="blade-inner">
<div class="inner-block" ng-controller="virtoCommerce.orderModule.customerOrderDetailController">
<div class="order-status clearfix">
Expand All @@ -7,10 +7,10 @@
<div class="reason" ng-bind="blade.currentEntity.cancelReason" ng-if="blade.currentEntity.isCancelled"></div>
</div>
<div class="column">
<span>{{'subscription.blades.subscription-detail.labels.balance' | translate}}:&nbsp;{{blade.currentEntity.balance | number:2}}&nbsp;{{blade.customerOrder.currency}}</span>
<div class="status">{{'subscription.blades.subscription-detail.labels.balance' | translate}}:&nbsp;{{blade.currentEntity.balance | number:2}}&nbsp;{{blade.customerOrder.currency}}</div>
</div>
</div>
<form name="formScope">
<form name="formScope" class="form">
<fieldset ng-disabled="blade.isLocked">
<va-metaform registered-inputs="blade.metaFields" blade="blade" column-count="2" ng-init="setForm(formScope)"></va-metaform>
</fieldset>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="gridster-cnt" ng-click="openBlade()">
<div class="gridster-cnt" ng-click="openBlade()">
<div class="cnt-inner">
<div class="list-t" translate="{{subscription.number ? 'subscription.widgets.order-subscription.title' : 'subscription.widgets.order-subscription.title-no' }}" translate-values="{{subscription}}"></div>
<div class="list-t" translate="{{subscription.number ? 'subscription.widgets.order-subscription.title' : 'subscription.widgets.order-subscription.title-no' }}"></div>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<div class="cnt-inner">
<i class="fas fa-sync-alt fa-2x fa-gray"></i>
<div class="list-count" ng-if="loading">...</div>
<div class="list-t" ng-if="!loading" translate="{{schedule.id ? 'subscription.widgets.product-schedule.info' : 'subscription.widgets.product-schedule.no-schedule' }}" translate-values="{{schedule}}"></div>
<div class="list-t" ng-if="!loading" translate="{{schedule.id ? 'subscription.widgets.product-schedule.info' : 'subscription.widgets.product-schedule.no-schedule' }}" ></div>
</div>
</div>

0 comments on commit 85b4736

Please sign in to comment.