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

7 years ago · 243de321e1
parent ace0dcb970 8d80e1ff97
commit 243de321e1
2 changed files with 5 additions and 1 deletions
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@ -381,6 +381,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                    return;
                }
            }
+            if (!$scope.partner.logo_url) {
+                alert("Logo is necessary!");
+                return;
+            }
            if ($scope.partner.referrer_id) {
                $scope.referrers.forEach(function (e) {
                    if ($scope.partner.referrer_id == e.org_id) {
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@ -116,7 +116,7 @@
                                </div>
                            </div>
                            <div class="form-group">
-                                <label class="control-label col-sm-2">Logo</label>
+                                <label class="control-label col-sm-2">* Logo</label>
                                <div class="col-sm-8">
                                    <div class="form-control-static">
                                        <button class="btn btn-success" type="button"