Moved Terms aggrement from account to order, display terms and conditions

core/lib/Thelia/Form/CustomerCreateForm.php

@@ -86,17 +86,8 @@ class CustomerCreateForm extends AddressCreateForm
                     "for" => "newsletter"
                 ),
                 "required" => false
-            ))
-            // Add terms & conditions
-            ->add("agreed", "checkbox", array(
-                "constraints" => array(
-                    new Constraints\True(array("message" => Translator::getInstance()->trans("Please accept the Terms and conditions in order to register.")))
-                ),
-                "label"=>"Test",
-                "label_attr" => array(
-                    "for" => "agreed"
-                )
             ));
+
     }
 
     public function verifyPasswordField($value, ExecutionContextInterface $context)

core/lib/Thelia/Form/CustomerProfileUpdateForm.php

@@ -43,9 +43,7 @@ class CustomerProfileUpdateForm extends CustomerCreateForm
             ->remove("country")
             // Remove Login Information
             ->remove("password")
-            ->remove("password_confirm")
-            // Remove Terms & conditions
-            ->remove("agreed");
+            ->remove("password_confirm");
     }
 
     /**

core/lib/Thelia/Form/OrderPayment.php

@@ -50,6 +50,16 @@ class OrderPayment extends FirewallForm
                         )
                     ))
                 )
+            ))
+            // Add terms & conditions
+            ->add("agreed", "checkbox", array(
+                "constraints" => array(
+                    new Constraints\True(array("message" => Translator::getInstance()->trans("Please accept the Terms and conditions in order to register.")))
+                ),
+                "label"=>"Agreed",
+                "label_attr" => array(
+                    "for" => "agreed"
+                )
             ));
     }