API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Mar 3rd, 2018
262
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.68 KB | None | 0 0
raw download clone embed print report
  1. BUILD SUCCESSFUL
  2.  
  3. Total time: 1 mins 44.599 secs
  4. nadi@nadijens ~/Documents/nadi/dev2 $ git log --stat
  5. commit e8d93dbeac8316e1bf3d12f492fb855e29017157
  6. Author: gembong <gembonx@gmail.com>
  7. Date: Sat Mar 3 15:22:42 2018 +0700
  8.  
  9. - Still tinking of handling payment
  10.  
  11. android/src/main/java/co/nadi/application/PaymentHandler.java | 54 ++++++++++++++++++++++++++++++++++++++++
  12. android/src/main/java/co/nadi/application/PaymentInterface.java | 12 +++++++++
  13. 2 files changed, 66 insertions(+)
  14.  
  15. commit d5d23e0dacff315572e427245c79c375e94a55a8
  16. Author: gembong <gembonx@gmail.com>
  17. Date: Sat Mar 3 14:23:39 2018 +0700
  18.  
  19. - check null.
  20.  
  21. android/src/main/java/co/nadi/pos/model/PaymentHistory.java | 2 +-
  22. 1 file changed, 1 insertion(+), 1 deletion(-)
  23.  
  24. commit c27102aef50becfe11e0d542d063faf10704cfb7
  25. Merge: 2b0e718 c7c48ee
  26. Author: gembong <gembonx@gmail.com>
  27. Date: Sat Mar 3 14:09:32 2018 +0700
  28.  
  29. Merge branch 'development2' of https://bitbucket.org/ZakunaDevTeam/nadi-android-app-restaurant-v2 into development2
  30.  
  31. commit 2b0e718a4865116edffadfa1b477294ca7dfd1de
  32. Author: gembong <gembonx@gmail.com>
  33. Date: Sat Mar 3 14:08:15 2018 +0700
  34.  
  35. - limit character to ascii only
  36.  
  37. android/src/main/res/layout/dialog_fragment_void.xml | 4 ++--
  38. android/src/main/res/layout/dialog_fragment_void_portrait.xml | 4 ++--
  39. 2 files changed, 4 insertions(+), 4 deletions(-)
  40.  
  41. commit a8139b1df63d49262cefffc777ebe194da284fcb
  42. Author: gembong <gembonx@gmail.com>
  43. Date: Sat Mar 3 14:07:46 2018 +0700
  44.  
  45. - max length note to 253
  46.  
  47. android/src/main/java/co/nadi/pos/model/PaymentHistory.java | 2 +-
  48. 1 file changed, 1 insertion(+), 1 deletion(-)
  49.  
  50. commit c7c48ee6ba96d5ef150de015bce143894954d2cd
  51. Author: surya <surya@nadipos.com>
  52. Date: Sat Mar 3 14:00:17 2018 +0700
  53.  
  54. fix wrong printerMapper in report
  55.  
  56. android/src/main/java/co/nadi/pos/SettingPaymentTypeReportFragment.java | 2 +-
  57. 1 file changed, 1 insertion(+), 1 deletion(-)
  58.  
  59. commit 4ddfbf404534339f1f1c48a38b1f3b87fa099edc
  60. Merge: 847e36b 6be6e0c
  61. Author: surya <surya@nadipos.com>
  62. Date: Sat Mar 3 13:56:25 2018 +0700
  63.  
  64. Merge branch 'development2' of https://bitbucket.org/ZakunaDevTeam/nadi-android-app-restaurant-v2 into development2
  65.  
  66. commit 847e36bf594586cfa17027f3377a9f5bf4a6ee60
  67. Author: surya <surya@nadipos.com>
  68. Date: Sat Mar 3 13:56:03 2018 +0700
  69.  
  70. update UI report cash drawer
  71.  
  72. android/src/main/java/co/nadi/pos/ReportsActivity.java | 2 +-
  73. android/src/main/java/co/nadi/pos/SettingCashDrawerReport.java | 127 +++++++++++++++++++++++++++++-----------
  74. android/src/main/res/layout/item_report_cash_drawer.xml | 31 ++++++++++
  75. 3 files changed, 126 insertions(+), 34 deletions(-)
  76.  
  77. commit 14338f85ed3b19aa45f9f05fea9e3c50d30faca2
  78. Author: surya <surya@nadipos.com>
  79. Date: Sat Mar 3 12:49:46 2018 +0700
  80.  
  81. update UI Report Attendance and change array string to model in attendanceDao
  82.  
  83. android/src/main/java/co/nadi/pos/ReportsActivity.java | 2 +-
  84. android/src/main/java/co/nadi/pos/SettingAttendanceReportFragment.java | 114 +++++++++++++++++-----
  85. android/src/main/java/co/nadi/pos/SettingLoginLogoutFragment.java | 12 +--
  86. android/src/main/java/co/nadi/pos/TableReportsAttendance.java | 159 ------------------------------
  87. android/src/main/java/co/nadi/pos/TableReportsAttendanceByDate.java | 165 --------------------------------
  88. android/src/main/java/co/nadi/pos/db/AttendanceDao.java | 33 +++----
  89. android/src/main/java/co/nadi/pos/model/Attendance.java | 11 ++-
  90. android/src/main/res/layout/item_report_attendance.xml | 77 +++++++++++++++
  91. android/src/main/res/values-in/strings.xml | 1 +
  92. android/src/main/res/values/strings.xml | 1 +
  93. 10 files changed, 201 insertions(+), 374 deletions(-)
  94.  
  95. commit 6be6e0ce2271d30e5a5a0a2b75d6875a02a5e23a
  96. Merge: 4cc08b2 bf42d54
  97. Author: gembong <gembonx@gmail.com>
  98. Date: Sat Mar 3 12:41:03 2018 +0700
  99.  
  100. Merge branch 'development2' of https://bitbucket.org/ZakunaDevTeam/nadi-android-app-restaurant-v2 into development2
  101.  
  102. commit 4cc08b22298ee96e9067ac964add90b178aa2005
  103. Author: gembong <gembonx@gmail.com>
  104. Date: Sat Mar 3 12:40:21 2018 +0700
  105.  
  106. - limit character range to ascii
  107.  
  108. android/src/main/res/layout/dialog_cash_masuk_keluar.xml | 2 +-
  109. android/src/main/res/layout/dialog_cash_masuk_keluar_portrait.xml | 2 +-
  110. 2 files changed, 2 insertions(+), 2 deletions(-)
  111.  
  112. commit bf42d5472c8903285c746836cbd258d28010f665
  113. Merge: de87ffd ddf35e7
  114. Author: surya <surya@nadipos.com>
  115. Date: Sat Mar 3 12:37:57 2018 +0700
  116.  
  117. Merge branch 'development2' of https://bitbucket.org/ZakunaDevTeam/nadi-android-app-restaurant-v2 into development2
  118.  
  119. commit de87ffd07b085b4db07123c55f4febc626b7afa0
  120. Author: surya <surya@nadipos.com>
  121. Date: Sat Mar 3 12:37:11 2018 +0700
  122.  
  123. update UI Report Login Log, change array string to model in getAllLoginLog on LoginDao, and add exclude parameter on loginLog model
  124.  
  125. android/src/main/java/co/nadi/pos/SettingLoginLogoutFragment.java | 123 +++++++++++++++++++++++++++++--------
  126. android/src/main/java/co/nadi/pos/TableReportLoginLogout.java | 99 -----------------------------
  127. android/src/main/java/co/nadi/pos/db/LoginDao.java | 26 ++++----
  128. android/src/main/java/co/nadi/pos/model/LoginLog.java | 11 ++++
  129. android/src/main/java/co/nadi/printer/LoginLogPrinter.java | 9 +--
  130. android/src/main/java/co/nadi/printer/LoginLogPrinterMpop.java | 11 ++--
  131. android/src/main/res/layout/item_report_login_log.xml | 77 +++++++++++++++++++++++
  132. android/src/main/res/values-in/strings.xml | 4 +-
  133. android/src/main/res/values/strings.xml | 3 +
  134. 9 files changed, 217 insertions(+), 146 deletions(-)
  135.  
  136. commit ddf35e720a83542a481da7b14aa27f088b58f61d
  137. Merge: fa1bd60 6306681
  138. Author: gembong <gembonx@gmail.com>
  139. Date: Sat Mar 3 12:16:25 2018 +0700
  140.  
  141. Merge branch 'development2' of https://bitbucket.org/ZakunaDevTeam/nadi-android-app-restaurant-v2 into development2
  142.  
  143. commit fa1bd6001bb3a5500480f4881a6fc0cd8b48bd14
  144. Author: gembong <gembonx@gmail.com>
  145. Date: Sat Mar 3 12:15:45 2018 +0700
  146.  
  147. - limit ascii only char
  148.  
  149. android/src/main/res/layout/setting_printer_option.xml | 4 ++--
  150. 1 file changed, 2 insertions(+), 2 deletions(-)
  151.  
  152. commit 40fc6abc6ad69096fe4bf8408876799fa4325987
  153. Author: surya <surya@nadipos.com>
  154. Date: Sat Mar 3 12:01:23 2018 +0700
  155.  
  156. change background
  157.  
  158. android/src/main/res/layout/fragment_setting_inventory_summary.xml | 2 +-
  159. android/src/main/res/layout/item_inventory_summary_reports.xml | 2 +-
  160. 2 files changed, 2 insertions(+), 2 deletions(-)
  161.  
  162. commit 6306681e8e65b1006e25751480220b777aa3a1d2
  163. Author: surya <surya@nadipos.com>
  164. Date: Sat Mar 3 11:51:47 2018 +0700
  165.  
  166. change background
  167.  
  168. android/src/main/res/layout/fragment_setting_cash_fragment.xml | 2 +-
  169. android/src/main/res/layout/item_cash_report.xml | 2 +-
  170. 2 files changed, 2 insertions(+), 2 deletions(-)
  171.  
  172. commit 8519227d71a338df755853329ec8762146549366
  173. Merge: 573553c fc373de
  174. Author: surya <surya@nadipos.com>
  175. Date: Sat Mar 3 11:51:36 2018 +0700
  176.  
  177. Merge branch 'development2' of https://bitbucket.org/ZakunaDevTeam/nadi-android-app-restaurant-v2 into development2
  178.  
  179. commit 573553cfa7de814262867a05e407821b8347f4aa
  180. Author: surya <surya@nadipos.com>
  181. Date: Sat Mar 3 11:46:18 2018 +0700
  182.  
  183. UI Report PaymentType Update
  184.  
  185. .../src/main/java/co/nadi/pos/SettingPaymentTypeReportFragment.java | 127 ++++++++++++++++++++++++--------
  186. android/src/main/res/layout/fragment_setting_payment_type.xml | 6 +-
  187. android/src/main/res/layout/item_report_payment_type.xml | 61 +++++++++++++++
  188. 3 files changed, 162 insertions(+), 32 deletions(-)
  189.  
  190. commit fc373de42cc35b6f88e5ab7a61f9b93108ac0ac6
  191. Author: gembong <gembonx@gmail.com>
  192. Date: Sat Mar 3 11:24:25 2018 +0700
  193.  
  194. - limit character ascii only
  195.  
  196. android/src/main/res/layout/modifiers_new_portrait.xml | 2 +-
  197. 1 file changed, 1 insertion(+), 1 deletion(-)
  198.  
  199. commit a0450b6bbecb489bf03b7bc208f06a2386b1f07d
  200. Author: gembong <gembonx@gmail.com>
  201. Date: Sat Mar 3 11:24:01 2018 +0700
  202.  
  203. - edittext with my rule
  204.  
  205. android/src/main/java/co/nadi/pos/widget/ConstrainEditText.java | 38 ++++++++++++++++++++++++++++++++++++++
  206. 1 file changed, 38 insertions(+)
  207.  
  208. commit 7f32193dde3747a8a7b42a89c6d828014be5dc74
  209. Author: gembong <gembonx@gmail.com>
  210. Date: Sat Mar 3 11:23:38 2018 +0700
  211.  
  212. - digit key listener with qwerty keyboard
  213.  
  214. android/src/main/java/co/nadi/pos/widget/DigitsKeyListener.java | 198 +++++++++++++++++++++++++++++++++++++++
  215. 1 file changed, 198 insertions(+)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!