diff --git a/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/chat_driver.jsp b/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/chat_driver.jsp
index 515f8bc7646df8b7f4e8c0421bb5ac80ef0570eb..dea4987c973326dac18750656f5b1750a11fa199 100644
--- a/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/chat_driver.jsp
+++ b/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/chat_driver.jsp
@@ -96,8 +96,8 @@
                 if ($scope.chatText.length !== 0) {
                     $scope.chatList.push({
                         from: 'me',
-                        text: this.chatText
-                    })
+                        text: $scope.chatText
+                    });
                 }
 
                 $scope.chatText = ''
diff --git a/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/order_driver.jsp b/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/order_driver.jsp
index d7e3fa1d88c8620a40330737cd757037711ed2d7..c19f2ec977e68b695ae3f449042364e4986cc803 100644
--- a/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/order_driver.jsp
+++ b/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/order_driver.jsp
@@ -12,40 +12,39 @@
                 </div>
             </div>
         </div>
-        <div class="order-form">
+        <div class="order-form" ng-controller="controlShow">
             <div class="txt-center">
-                <h2 ng-show="show" class="inline-block">Finding Order....</h2>
+                <h2 ng-show="textFind" class="inline-block">Finding Order....</h2>
             </div>
             <div class="txt-center">
-                <button class="form-input find-button" ng-hide="closeFind" ng-click="show=true; showClose=true; closeFind=true">FIND ORDER</button>
-                <button class="close-button" ng-show="showClose" ng-click="show=false; closeFind=false; showClose=false">CLOSE</button>
+                <button class="form-input find-button" ng-hide="buttonFind" ng-click="hideFind()">FIND ORDER</button>
+                <button class="close-button-order" ng-show="buttonClose" ng-click="hideClose()">CLOSE</button>
             </div>
         </div>
     </div>
 </div>
 
-<script>
-    angular.module('chatApp', [])
-        .controller('ChatController', function ($scope, $http) {
-            $scope.chatList = []
-
-            $scope.addChat = function () {
-                if ($scope.chatText.length !== 0) {
-                    $scope.chatList.push({
-                        from: 'me',
-                        text: this.chatText
-                    })
-                }
-
-                $scope.chatText = ''
-            }
-        })
-</script>
-
-
 <%@include file="/component/footer.html" %>
 
 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
 <script>
     window.onload = toggleActive("nav-order")
 </script>
+<script>
+    var chatApp = angular.module('chatApp', [])
+        .controller('controlShow', function($scope) {
+            $scope.hideFind = function() {
+                $scope.textFind = true;
+                $scope.buttonClose = true;
+                $scope.buttonFind = true;
+            };
+
+            $scope.hideClose = function() {
+                $scope.textFind = false;
+                $scope.buttonFind = false;
+                $scope.buttonClose = false;
+
+            };
+
+    });
+</script>