Browse Source

bullshit removal

Maxim Sokhatsky 11 years ago
parent
commit
f7869189c3
2 changed files with 5 additions and 18 deletions
  1. 1 14
      include/payments.hrl
  2. 4 4
      src/kvs_payment.erl

+ 1 - 14
include/payments.hrl

@@ -1,7 +1,6 @@
 -include("kvs.hrl").
 -include("kvs.hrl").
 
 
--type payment_state() :: added | done | cancelled | pending | untracked |
-                         failed | unknown | confirmed | discarded.
+-type payment_state() :: added | done | cancelled | pending | untracked | failed | unknown | confirmed | discarded.
 -type payment_type():: credit_card | mobile | paypal | wire_transfer | facebook.
 -type payment_type():: credit_card | mobile | paypal | wire_transfer | facebook.
 
 
 -record(state_change, {
 -record(state_change, {
@@ -24,18 +23,6 @@
         state_log = []  :: [#state_change{}],
         state_log = []  :: [#state_change{}],
         info            :: any() }).
         info            :: any() }).
 
 
--define(MP_STATE_ADDED,      added).
--define(MP_STATE_DONE,       done).
--define(MP_STATE_CANCELLED,  cancelled).
--define(MP_STATE_UNTRACKED,  untracked).
--define(MP_STATE_PENDING,    pending).
--define(MP_STATE_FAILED,     failed).
--define(MP_STATE_UNKNOWN,    unknown).
--define(MP_STATE_CONFIRMED,  confirmed).
--define(MP_STATE_UNEXPECTED, unexpected).
--define(MP_STATE_DISCARDED,  discarded).
--define(MP_MONTHLY_LIMIT_MULTIPLIER, 3).
-
 -record(pi_credit_card, {
 -record(pi_credit_card, {
         cardholder_name,
         cardholder_name,
         cardholder_surname,
         cardholder_surname,

+ 4 - 4
src/kvs_payment.erl

@@ -55,7 +55,7 @@ add_payment(#payment{} = MP) -> add_payment(#payment{} = MP, undefined, undefine
 add_payment(#payment{} = MP, State0, Info) ->
 add_payment(#payment{} = MP, State0, Info) ->
     error_logger:info_msg("ADD PAYMENT"),
     error_logger:info_msg("ADD PAYMENT"),
     Start = now(),
     Start = now(),
-    State = default_if_undefined(State0, undefined, ?MP_STATE_ADDED),
+    State = default_if_undefined(State0, undefined, 'added'),
     StateLog = case Info of
     StateLog = case Info of
         undefined -> [#state_change{time = Start, state = State, info = system_change}];
         undefined -> [#state_change{time = Start, state = State, info = system_change}];
         _ -> [#state_change{time = Start, state = State, info = Info}] end,
         _ -> [#state_change{time = Start, state = State, info = Info}] end,
@@ -70,9 +70,9 @@ set_payment_state(MPId, NewState, Info) ->
         StateLog = MP#payment.state_log,
         StateLog = MP#payment.state_log,
         NewStateLog = [#state_change{time = Time, state = NewState, info = Info}|StateLog],
         NewStateLog = [#state_change{time = Time, state = NewState, info = Info}|StateLog],
         EndTime = case NewState of
         EndTime = case NewState of
-                  ?MP_STATE_DONE -> now();
-                  ?MP_STATE_CANCELLED -> now();
-                  ?MP_STATE_FAILED -> now();
+                  'done' -> now();
+                  'cancelled' -> now();
+                  'failed' -> now();
                   _ -> MP#payment.end_time end,
                   _ -> MP#payment.end_time end,
 
 
         NewMP=MP#payment{state = NewState, end_time = EndTime, state_log = NewStateLog},
         NewMP=MP#payment{state = NewState, end_time = EndTime, state_log = NewStateLog},