forked from DGNum/gestioCOF
Woops
This commit is contained in:
parent
f4def6d51b
commit
6938d5283a
1 changed files with 0 additions and 9 deletions
|
@ -31,11 +31,7 @@ var Account = Backbone.Model.extend({
|
|||
|
||||
view: function () {
|
||||
var view_class;
|
||||
<<<<<<< HEAD
|
||||
if (this.is_empty_account()) {
|
||||
=======
|
||||
if (!this.is_valid()) {
|
||||
>>>>>>> New checkout model and manager
|
||||
view_class = EmptyAccountView
|
||||
} else if (this.get("trigramme") == "LIQ") {
|
||||
view_class = LIQView
|
||||
|
@ -49,13 +45,8 @@ var Account = Backbone.Model.extend({
|
|||
this.view().render();
|
||||
},
|
||||
|
||||
<<<<<<< HEAD
|
||||
is_empty_account: function () {
|
||||
return (this.id == 0)
|
||||
=======
|
||||
is_valid: function () {
|
||||
return (this.id != 0)
|
||||
>>>>>>> New checkout model and manager
|
||||
},
|
||||
})
|
||||
|
||||
|
|
Loading…
Reference in a new issue